Index: applications/editors/josm/i18n/po/ar.po =================================================================== --- applications/editors/josm/i18n/po/ar.po (revision 20093) +++ applications/editors/josm/i18n/po/ar.po (revision 20140) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-21 09:35+0100\n" -"PO-Revision-Date: 2010-02-18 00:09+0000\n" +"POT-Creation-Date: 2010-02-24 19:46+0100\n" +"PO-Revision-Date: 2010-02-21 11:11+0000\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: Arabic \n" @@ -17,5 +17,5 @@ "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= " "3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n" -"X-Launchpad-Export-Date: 2010-02-21 08:16+0000\n" +"X-Launchpad-Export-Date: 2010-02-24 18:31+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -70,6 +70,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:291 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 @@ -243,5 +243,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -387,5 +387,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -685,5 +685,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:989 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -807,5 +807,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 msgid "Duplicate" msgstr "نسخة مطابقة" @@ -1639,6 +1639,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215 msgid "No, abort" @@ -2339,5 +2339,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:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149 @@ -2888,5 +2888,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1111 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 msgid "Double conflict" msgstr "" @@ -2919,5 +2919,5 @@ #. should not happen #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 msgid "Cannot resolve undecided conflict." msgstr "" @@ -3088,10 +3088,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:53 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:71 #, java-format msgid "Main dataset does not include node {0}" @@ -3366,27 +3366,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:148 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:228 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:243 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:248 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3396,5 +3396,5 @@ #. 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:281 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 #, java-format msgid "" @@ -3551,6 +3551,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:291 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:313 +#: ../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}." @@ -3668,5 +3668,5 @@ #. darker blue #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:183 msgid "background" @@ -3912,5 +3912,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 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 msgid "Conflict" msgstr "التناقض" @@ -4156,5 +4156,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:936 #: ../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/dialogs/relation/ReferringRelationsBrowser.java:143 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:209 @@ -4389,14 +4389,14 @@ msgstr "" -#: ../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/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "" -#: ../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/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:235 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:239 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:507 @@ -4405,6 +4405,6 @@ msgstr "" -#: ../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/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4412,16 +4412,16 @@ msgstr "" -#: ../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:271 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:275 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "الأعضاء" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "Tags({0} conflict)" @@ -4430,5 +4430,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4437,26 +4437,26 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 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:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:194 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4464,25 +4464,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:211 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:292 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 msgid "Conflict Resolution" msgstr "" @@ -4528,5 +4528,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 msgid "My version" msgstr "" @@ -4537,6 +4537,6 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" msgstr "" @@ -4549,5 +4549,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 msgid "Their version" msgstr "" @@ -4716,9 +4716,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 msgid "Merged nodes not frozen yet. Cannot build resolution command." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:460 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:463 #, java-format msgid "" @@ -4727,19 +4727,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:540 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:509 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:543 msgid "Yes, undelete them too" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:507 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:541 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 msgid "No, cancel operation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514 #, java-format msgid "" @@ -4752,9 +4752,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:524 msgid "Undelete additional nodes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:548 #, java-format msgid "" @@ -4767,13 +4767,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:555 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:558 msgid "Undelete dependent primitives?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "" "Properties in the merged element. They will replace properties in my " @@ -4781,91 +4781,91 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 msgid "Coordinates:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 msgid "Referenced by:" msgstr "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:390 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "تم حذفه" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:392 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 msgid "not deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 msgid "visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:401 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 msgid "not visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 msgid "Keep a clone of the local version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:410 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:528 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:543 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:558 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:573 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:603 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:638 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 #, java-format msgid "" @@ -4875,17 +4875,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:645 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 msgid "Reset id to 0" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 msgid "Keep their visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:674 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 msgid "Yes, purge it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:679 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 #, java-format msgid "" @@ -4894,9 +4894,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:684 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 msgid "Remove from dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 msgid "Undecide conflict between visible state" msgstr "" @@ -4966,25 +4966,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:128 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:129 msgid "My version (local dataset)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:151 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:152 msgid "Their version (server dataset)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:275 msgid "Keep the selected key/value pairs from the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:304 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:305 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:397 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:398 msgid "Undecide" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:400 msgid "Mark the selected tags as undecided" msgstr "" @@ -5027,5 +5027,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 msgid "Apply" msgstr "" @@ -5336,18 +5336,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 #, java-format msgid "Conflicts: {0} unresolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:325 msgid "Resolve" msgstr "حلّ" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326 msgid "Open a merge dialog of all selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 @@ -5468,5 +5468,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 @@ -5563,5 +5563,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1365 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5615,5 +5615,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:353 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -7299,5 +7299,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7346,26 +7346,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 msgid "Tags and Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Parent Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:297 msgid "Apply Role:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "" "There is at least one member in this relation referring
to the " @@ -7374,14 +7374,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:605 #, java-format msgid "" @@ -7391,9 +7391,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:615 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633 #, java-format msgid "" @@ -7403,15 +7403,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:674 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:700 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:727 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7419,5 +7419,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:761 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7425,20 +7425,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:796 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:830 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:842 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 #, java-format msgid "" @@ -7447,80 +7447,80 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:864 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:886 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:887 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Reverse the order of the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 msgid "Move the currently selected members up" msgstr "حرّك الأعضاء المختارة حالياً إلى الأعلى" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:933 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 msgid "Move the currently selected members down" msgstr "حرّك الأعضاء المختارة حالياً إلى الأسفل" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1075 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1081 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7529,5 +7529,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1105 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 #, java-format msgid "" @@ -7536,47 +7536,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 msgid "Download Members" msgstr "نزّل الأعضاء" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +msgid "Relation Editor: Download Members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 -msgid "Relation Editor: Download Members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7585,25 +7585,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1313 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -7648,13 +7648,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92 msgid "Load parent relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 msgid "Loading parent relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141 msgid "Edit the currently selected relation" msgstr "" @@ -13637,5 +13637,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:348 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:353 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." Index: applications/editors/josm/i18n/po/bg.po =================================================================== --- applications/editors/josm/i18n/po/bg.po (revision 20093) +++ applications/editors/josm/i18n/po/bg.po (revision 20140) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-21 09:35+0100\n" +"POT-Creation-Date: 2010-02-24 19:46+0100\n" "PO-Revision-Date: 2010-01-23 21:56+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-02-21 08:15+0000\n" +"X-Launchpad-Export-Date: 2010-02-24 18:31+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -69,6 +69,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:291 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 @@ -247,5 +247,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -393,5 +393,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -695,5 +695,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:989 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -818,5 +818,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 msgid "Duplicate" msgstr "Дублиране" @@ -1663,6 +1663,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215 msgid "No, abort" @@ -2386,5 +2386,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:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149 @@ -2956,5 +2956,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1111 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 msgid "Double conflict" msgstr "Двоен конфликт" @@ -2989,5 +2989,5 @@ #. should not happen #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 msgid "Cannot resolve undecided conflict." msgstr "" @@ -3164,10 +3164,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:53 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "Разрешаване на конфликт във възлите на път {0}" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:71 #, java-format msgid "Main dataset does not include node {0}" @@ -3454,27 +3454,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:148 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:228 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:243 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:248 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3484,5 +3484,5 @@ #. 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:281 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 #, java-format msgid "" @@ -3627,6 +3627,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:291 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:313 +#: ../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}." @@ -3744,5 +3744,5 @@ #. darker blue #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:183 msgid "background" @@ -3986,5 +3986,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 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 msgid "Conflict" msgstr "Конфликт" @@ -4236,5 +4236,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:936 #: ../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/dialogs/relation/ReferringRelationsBrowser.java:143 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:209 @@ -4470,14 +4470,14 @@ msgstr "роля {0} не участва в двойката за сравнение {1}" -#: ../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/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Настройки" -#: ../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/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:235 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:239 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:507 @@ -4486,6 +4486,6 @@ msgstr "Маркери" -#: ../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/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4493,16 +4493,16 @@ msgstr "Възли" -#: ../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:271 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:275 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Членове" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 msgid "No pending tag conflicts to be resolved" msgstr "Няма чакащи tag конфликти за разрешаване" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "Tags({0} conflict)" @@ -4511,5 +4511,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4518,26 +4518,26 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "Nodes(resolved)" msgstr "Възли(решени)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 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:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Nodes(with conflicts)" msgstr "Възли(с конфликт)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:194 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Members(resolved)" msgstr "Членове (разрешени)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4545,25 +4545,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Members(with conflicts)" msgstr "Членове (с конфликти)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 msgid "No pending property conflicts" msgstr "Няма чакащи конфликти на характеристиките" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:211 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Properties(with conflicts)" msgstr "Характеристики (с конфликти)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 msgid "Pending property conflicts to be resolved" msgstr "Чакащи за разрешаване конфликти на характеристики" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:292 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 msgid "Conflict Resolution" msgstr "Разрешение на конфликт" @@ -4609,5 +4609,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 msgid "My version" msgstr "Моя версия" @@ -4618,6 +4618,6 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" msgstr "Обединена версия" @@ -4632,5 +4632,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 msgid "Their version" msgstr "Тяхна версия" @@ -4800,9 +4800,9 @@ msgstr "Възел" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 msgid "Merged nodes not frozen yet. Cannot build resolution command." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:460 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:463 #, java-format msgid "" @@ -4811,19 +4811,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 msgid "Communication with server failed" msgstr "Връзката със сървъра пропадна" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:540 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:509 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:543 msgid "Yes, undelete them too" msgstr "Да, възстанови от изтриване също" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:507 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:541 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 msgid "No, cancel operation" msgstr "Не, отказване на операцията" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514 #, java-format msgid "" @@ -4836,9 +4836,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:524 msgid "Undelete additional nodes?" msgstr "Възстановяване на изтрити допълнителни възли?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:548 #, java-format msgid "" @@ -4851,13 +4851,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:555 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:558 msgid "Undelete dependent primitives?" msgstr "Възстановяване след изтриване на свързани примитиви?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Характеристики в моята база дании (локалната база данни)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "" "Properties in the merged element. They will replace properties in my " @@ -4865,91 +4865,91 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Характеристики в тяхната база дании (базата данни на сървъра)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 msgid "Coordinates:" msgstr "Координати:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 msgid "Deleted State:" msgstr "Изтрито състояние:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 msgid "Visible State:" msgstr "Видимо състояние:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 msgid "Referenced by:" msgstr "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(никой)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:390 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "изтрито" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:392 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 msgid "not deleted" msgstr "не е изтрито" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 msgid "visible (on the server)" msgstr "видимо (на сървъра)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:401 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 msgid "not visible (on the server)" msgstr "не е видимо (на сървъра)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 msgid "Keep a clone of the local version" msgstr "Запазване копие на местната версия" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:410 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 msgid "Physically delete from local dataset" msgstr "Физическо изтриване от местната база данни" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:528 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "Запазване на моите координати" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:543 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 msgid "Keep their coordiates" msgstr "Запазване на техните координати" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:558 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:573 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:603 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 msgid "Yes, reset the id" msgstr "Да, нулирай ID" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:638 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 #, java-format msgid "" @@ -4959,17 +4959,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:645 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 msgid "Reset id to 0" msgstr "Нулирай ID" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 msgid "Keep their visible state" msgstr "Запазване на тяхното видимо състояние" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:674 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 msgid "Yes, purge it" msgstr "Да, изчисти го!" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:679 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 #, java-format msgid "" @@ -4980,9 +4980,9 @@ "базата данни.
Съгласни ли сте?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:684 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 msgid "Remove from dataset" msgstr "Премахни от базата данни" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 msgid "Undecide conflict between visible state" msgstr "" @@ -5052,25 +5052,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:128 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:129 msgid "My version (local dataset)" msgstr "Моя версия (местна база данни)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:151 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:152 msgid "Their version (server dataset)" msgstr "Тяхна версия (база данни на сървъра)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:275 msgid "Keep the selected key/value pairs from the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:304 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:305 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:397 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:398 msgid "Undecide" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:400 msgid "Mark the selected tags as undecided" msgstr "" @@ -5113,5 +5113,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 msgid "Apply" msgstr "Приложи" @@ -5418,18 +5418,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 #, java-format msgid "Conflicts: {0} unresolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:325 msgid "Resolve" msgstr "Разрешаване" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326 msgid "Open a merge dialog of all selected items in the list above." msgstr "Отваряне диалог за сливане на избраните обекти от горния списък." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 @@ -5550,5 +5550,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 @@ -5645,5 +5645,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1365 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5697,5 +5697,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:353 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -7383,5 +7383,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7432,26 +7432,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 msgid "Tags and Members" msgstr "Етикети и членове" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Parent Relations" msgstr "Родителски релации" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 msgid "Child Relations" msgstr "Подчинени релации" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:297 msgid "Apply Role:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "" "There is at least one member in this relation referring
to the " @@ -7460,14 +7460,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:605 #, java-format msgid "" @@ -7477,9 +7477,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:615 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633 #, java-format msgid "" @@ -7489,15 +7489,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:674 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:700 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:727 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7505,5 +7505,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:761 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7511,20 +7511,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:796 msgid "Relation Editor: Remove Selected" msgstr "Редактор на отношения: Премахване на избраното" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:830 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:842 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 #, java-format msgid "" @@ -7533,80 +7533,80 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:864 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 msgid "Sort the relation members" msgstr "Сортиране на членовете на връзката" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:886 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:887 msgid "Relation Editor: Sort" msgstr "Редактор на връзки: Сортиране" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Reverse the order of the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 msgid "Move the currently selected members up" msgstr "Преместване на текущо избраните членове нагоре" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:933 msgid "Relation Editor: Move Up" msgstr "Редактор на връзки: Преместване нагоре" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 msgid "Move the currently selected members down" msgstr "Преместване на текущо избраните членове надолу" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 msgid "Relation Editor: Move Down" msgstr "Редактор на връзки: Преместване надолу" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 msgid "Remove the currently selected members from this relation" msgstr "Премахване на текущо избраните членове от тази връзка" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 msgid "Relation Editor: Remove" msgstr "Редактор на връзки: Премахване" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 msgid "Delete the currently edited relation" msgstr "Изтриване на текущо редактираната врзка" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 msgid "Yes, create a conflict and close" msgstr "Да, създай конфликт и затвори" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1075 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 msgid "No, continue editing" msgstr "Не, продължава редактирането" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1081 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7615,5 +7615,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1105 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 #, java-format msgid "" @@ -7622,47 +7622,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 msgid "Apply the updates and close the dialog" msgstr "Прилагане на обновяването и затваряне на прозореца." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Cancel the updates and close the dialog" msgstr "Прекъсване на обновяването и затваряне на диалоговия прозорец" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 msgid "Add an empty tag" msgstr "Добави празен етикет" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 msgid "Download Members" msgstr "Сваляне членове" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 msgid "Relation Editor: Download Members" msgstr "Редактор на връзки: Сваляне на членове" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 msgid "Sets a role for the selected members" msgstr "Установява роля за избраните членове" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 msgid "Apply Role" msgstr "Приложи роля" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7671,25 +7671,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1313 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 msgid "Yes, apply it" msgstr "Да, приложи го!" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 msgid "No, do not apply" msgstr "Не, не прилагай!" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 msgid "Confirm empty role" msgstr "Потвърди празна роля" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -7734,13 +7734,13 @@ msgstr "включително непосредствените наследници на родителските релации" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92 msgid "Load parent relations" msgstr "Зареди родителските релации" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 msgid "Loading parent relations" msgstr "Зареждане на родителските релации" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141 msgid "Edit the currently selected relation" msgstr "" @@ -13803,5 +13803,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:348 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:353 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -16322,12 +16322,10 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:291 -#, fuzzy msgid "Abort tag editing and close dialog" -msgstr "Прилагане на обновяването и затваряне на прозореца." +msgstr "" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:304 -#, fuzzy msgid "Apply edited tags and close dialog" -msgstr "Прилагане на обновяването и затваряне на прозореца." +msgstr "" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 @@ -30558,7 +30556,4 @@ msgstr "" -#~ msgid "" -#~ msgstr "<няколко>" - #~ msgid "" #~ "There were problems with the following plugins:\n" @@ -31563,4 +31558,7 @@ #~ msgstr "Премахване на възли от маршрут" +#~ msgid "" +#~ msgstr "<няколко>" + #~ msgid "Version number missing from OSM data" #~ msgstr "Версията липсва от OSM данните." Index: applications/editors/josm/i18n/po/cs.po =================================================================== --- applications/editors/josm/i18n/po/cs.po (revision 20093) +++ applications/editors/josm/i18n/po/cs.po (revision 20140) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-21 09:35+0100\n" -"PO-Revision-Date: 2010-02-20 11:36+0000\n" -"Last-Translator: hanoj \n" +"POT-Creation-Date: 2010-02-24 19:46+0100\n" +"PO-Revision-Date: 2010-02-24 11:00+0000\n" +"Last-Translator: Jezevec \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2010-02-21 08:16+0000\n" +"X-Launchpad-Export-Date: 2010-02-24 18:25+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -69,6 +69,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:291 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 @@ -249,5 +249,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -395,5 +395,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -696,5 +696,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:989 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -777,17 +777,17 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:55 msgid "Object type:" -msgstr "" +msgstr "Typ objektu:" #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:62 msgid "Object ID:" -msgstr "" +msgstr "ID objektu:" #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:64 msgid "Enter the ID of the object that should be downloaded" -msgstr "" +msgstr "Zadat ID objektu, který chcete stáhnout" #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:77 msgid "Download Object" -msgstr "" +msgstr "Stáhnout objekt" #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78 @@ -818,5 +818,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 msgid "Duplicate" msgstr "Duplikovat" @@ -944,4 +944,5 @@ msgstr[0] "Zvolená cesta má uzly mimo stahovanou oblast" msgstr[1] "Zvolené cesty mají uzly mimo stahovanou oblast" +msgstr[2] "Zvolené cesty mají uzly mimo stahovanou oblast" #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155 @@ -1241,6 +1242,7 @@ msgid "Opening {0} file..." msgid_plural "Opening {0} files..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Otevírám {0} soubor..." +msgstr[1] "Otevírám {0} soubory..." +msgstr[2] "Otevírám {0} souborů..." #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:262 @@ -1337,5 +1339,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:148 msgid "Selection must consist only of ways and nodes." -msgstr "" +msgstr "Výběr musí obsahovat pouze cesty a body" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:188 @@ -1658,13 +1660,13 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "Yes, delete nodes" -msgstr "" +msgstr "Ano,smazat body" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:67 msgid "Delete nodes outside of downloaded data regions" -msgstr "" +msgstr "Smazat body mimo staženou oblast dat" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215 msgid "No, abort" @@ -1674,5 +1676,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:119 msgid "Cancel operation" -msgstr "" +msgstr "Zrušit operaci" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:86 @@ -1682,5 +1684,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:88 msgid "Delete nodes outside of data regions?" -msgstr "" +msgstr "Smazat body mimo oblast s daty?" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:101 @@ -1696,5 +1698,5 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:113 msgid "Simplify all selected ways" -msgstr "" +msgstr "Zjednodušit všechny vybrané cesty" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:126 @@ -1703,8 +1705,9 @@ "The selection contains {0} ways. Are you sure you want to simplify them all?" msgstr "" +"Výběr obsahuje {0} cest. Jste si jistý že je chcete všechny zjednodušit?" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:129 msgid "Simplify ways?" -msgstr "" +msgstr "Zjednodušit cesty?" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:180 @@ -1712,6 +1715,7 @@ msgid "Simplify {0} way" msgid_plural "Simplify {0} ways" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Zjednodušit {0} cestu" +msgstr[1] "Zjednodušit {0} cesty" +msgstr[2] "Zjednodušit {0} cest" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:251 @@ -2393,5 +2397,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:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149 @@ -2512,5 +2516,5 @@ #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 msgid "range" -msgstr "" +msgstr "rozsah" #: ../core/src/org/openstreetmap/josm/actions/search/PushbackTokenizer.java:49 @@ -2812,13 +2816,13 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653 msgid "Primitive id expected" -msgstr "" +msgstr "Očekáváno ID prvku" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" -msgstr "" +msgstr "Očekáváno ID sady změn" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 msgid "Version expected" -msgstr "" +msgstr "Očekávána verze" #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 @@ -2834,4 +2838,6 @@ "length {2}. Values length is {3}." msgstr "" +"Délka hodnoty tagu ''{0}'' na objektu {1} překročila maximální dovolenou " +"délku {2}. Délka hodnoty je {3}." #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:70 @@ -2860,4 +2866,6 @@ "dependency." msgstr "" +"{0} relace tvoří cyklus, protože na sebe vzájemně odkazují.
JOSM je " +"nenahraje na server, dokud závislost neopravíte a neodstraníte cyklus." #: ../core/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java:53 @@ -2892,6 +2900,7 @@ msgid "Added {0} object" msgid_plural "Added {0} objects" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Přidán {0} objekt" +msgstr[1] "Přidány {0} objekty" +msgstr[2] "Přidáno {0} objektů" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 @@ -2963,5 +2972,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1111 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 msgid "Double conflict" msgstr "Dvojí konflikt" @@ -2996,5 +3005,5 @@ #. should not happen #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 msgid "Cannot resolve undecided conflict." msgstr "nemohu vyřešit nerozhodnutý konflikt" @@ -3008,15 +3017,15 @@ #, java-format msgid "Delete node {0}" -msgstr "" +msgstr "Smazat bod {0}" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162 #, java-format msgid "Delete way {0}" -msgstr "" +msgstr "Smazat cestu {0}" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163 #, java-format msgid "Delete relation {0}" -msgstr "" +msgstr "Smazat relaci {0}" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177 @@ -3105,6 +3114,7 @@ msgid "Purged {0} object" msgid_plural "Purged {0} objects" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Odstraněn {0} objekt" +msgstr[1] "Odstraněny {0} objekty" +msgstr[2] "Odstraněno {0} objektů" #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:155 @@ -3176,10 +3186,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:53 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "Vyřešit konflikty v seznamu bodů cesty {0}" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:71 #, java-format msgid "Main dataset does not include node {0}" @@ -3461,27 +3471,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:148 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:228 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:243 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:248 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3491,5 +3501,5 @@ #. 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:281 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 #, java-format msgid "" @@ -3637,6 +3647,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:291 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:313 +#: ../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}." @@ -3754,5 +3764,5 @@ #. darker blue #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:183 msgid "background" @@ -3996,5 +4006,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 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 msgid "Conflict" msgstr "Konflikt" @@ -4246,5 +4256,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:936 #: ../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/dialogs/relation/ReferringRelationsBrowser.java:143 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:209 @@ -4486,14 +4496,14 @@ msgstr "" -#: ../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/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Vlastnosti" -#: ../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/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:235 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:239 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:507 @@ -4502,6 +4512,6 @@ msgstr "Značky" -#: ../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/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4509,16 +4519,16 @@ msgstr "Body" -#: ../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:271 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:275 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Členové" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 msgid "No pending tag conflicts to be resolved" msgstr "Nezbývají žádné další konflikty značek k vyřešení" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "Tags({0} conflict)" @@ -4527,5 +4537,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4534,26 +4544,26 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "Nodes(resolved)" msgstr "Body(vyřešeno)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 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:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Nodes(with conflicts)" msgstr "Body(s konflikty)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 msgid "Pending conflicts in the node list of this way" msgstr "Nevyřešené konflikty v seznamu bodů v této cesty" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:194 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Members(resolved)" msgstr "Členové(vyřešeno)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4561,25 +4571,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Members(with conflicts)" msgstr "Členi (s konflikty)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending conflicts in the member list of this relation" msgstr "Nevyřešené konflikty v seznamu členů této relace" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 msgid "No pending property conflicts" msgstr "Nezbývají žádné konflikty ve vlastnostech" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:211 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Properties(with conflicts)" msgstr "Vlastnosti (s konflikty)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 msgid "Pending property conflicts to be resolved" msgstr "Zbývající konflikty k vyřešení ve vlastnostech" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:292 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 msgid "Conflict Resolution" msgstr "Řešení konfliktů" @@ -4625,5 +4635,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 msgid "My version" msgstr "Má verze" @@ -4634,6 +4644,6 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" msgstr "Sloučená verze" @@ -4646,5 +4656,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 msgid "Their version" msgstr "Cizí verze" @@ -4829,9 +4839,9 @@ msgstr "Bod" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 msgid "Merged nodes not frozen yet. Cannot build resolution command." msgstr "sloučené body nejsou dosud zmražené. Nelze vytvořit příkaz pro řešení" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:460 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:463 #, java-format msgid "" @@ -4840,19 +4850,19 @@ msgstr "Při komunikaci se serverem doslo k chybě
Detaily: {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 msgid "Communication with server failed" msgstr "Komunikace se serverem selhala" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:540 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:509 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:543 msgid "Yes, undelete them too" msgstr "Ano, obnovit je také" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:507 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:541 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 msgid "No, cancel operation" msgstr "Ne, zruš operaci" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514 #, java-format msgid "" @@ -4865,9 +4875,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:524 msgid "Undelete additional nodes?" msgstr "Obnovit další body?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:548 #, java-format msgid "" @@ -4880,13 +4890,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:555 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:558 msgid "Undelete dependent primitives?" msgstr "Obnovit závislé prvky?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Vlastnosti v mé datové sadě, např lokální datové sadě" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "" "Properties in the merged element. They will replace properties in my " @@ -4896,91 +4906,91 @@ "sloučení aplikováno." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Vlastnosti v cizí datové sadě, např serverová datová sada" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 msgid "Coordinates:" msgstr "Souřadnice:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 msgid "Deleted State:" msgstr "Stav smazáno:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 msgid "Visible State:" msgstr "Stav viditelné:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 msgid "Referenced by:" msgstr "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(žádný)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:390 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "smazáno" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:392 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 msgid "not deleted" msgstr "nesmazáno" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 msgid "visible (on the server)" msgstr "viditelný (na serveru)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:401 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 msgid "not visible (on the server)" msgstr "neviditelný (na serveru)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 msgid "Keep a clone of the local version" msgstr "Ponechat klon lokální verze" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:410 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 msgid "Physically delete from local dataset" msgstr "Fyzicky odstranit z lokální datové sady" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:528 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "Ponechat mé souřadnice" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:543 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 msgid "Keep their coordiates" msgstr "Ponechat cizí souřadnice" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:558 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 msgid "Undecide conflict between different coordinates" msgstr "Nerozhodnutý konflikt rozdílných souřadnic" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:573 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 msgid "Keep my deleted state" msgstr "Ponechat můj stav vymazáno" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 msgid "Keep their deleted state" msgstr "Ponechat cizí stav vymazáno" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:603 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 msgid "Undecide conflict between deleted state" msgstr "Nerozhodnutý konflikt stavu vymazáno" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 msgid "Keep my visible state" msgstr "Ponechat můj stav viditelné" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 msgid "Yes, reset the id" msgstr "Ano, resetovat id" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:638 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 #, java-format msgid "" @@ -4990,17 +5000,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:645 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 msgid "Reset id to 0" msgstr "Resetovat id na 0" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 msgid "Keep their visible state" msgstr "Ponechat cizí stav viditelné" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:674 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 msgid "Yes, purge it" msgstr "Ano, vyčistit to" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:679 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 #, java-format msgid "" @@ -5011,9 +5021,9 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:684 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 msgid "Remove from dataset" msgstr "Odstranit z datové sady" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 msgid "Undecide conflict between visible state" msgstr "Nerozhodnutý konflikt stavu viditelné" @@ -5083,25 +5093,25 @@ msgstr "nelze aplikovat nerozhodnutou položku slučování tagů" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:128 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:129 msgid "My version (local dataset)" msgstr "Má verze (lokální datová sada)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:151 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:152 msgid "Their version (server dataset)" msgstr "Cizí verze (serverová datová sada)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:275 msgid "Keep the selected key/value pairs from the local dataset" msgstr "Ponechat vybrané páry klíč/hodnota z lokální datové sady" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:304 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:305 msgid "Keep the selected key/value pairs from the server dataset" msgstr "Ponechat vybrané páry klíč/hodnota ze serverové datové sady" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:397 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:398 msgid "Undecide" msgstr "Nerozhodnuto" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:400 msgid "Mark the selected tags as undecided" msgstr "Označit vybrané tagy jako nerozhodnuté" @@ -5144,5 +5154,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 msgid "Apply" msgstr "Aplikovat" @@ -5454,14 +5464,14 @@ msgstr "Vyřešit konflikty." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 #, java-format msgid "Conflicts: {0} unresolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:325 msgid "Resolve" msgstr "Vyřešit" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5469,5 +5479,5 @@ "seznamu." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 @@ -5588,5 +5598,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 @@ -5683,5 +5693,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1365 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 msgid "Create a copy of this relation and open it in another editor window" msgstr "Vytvořit kopii relace a otevřít ji v novém okně" @@ -5735,5 +5745,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:353 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -7433,5 +7443,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7483,26 +7493,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 msgid "Tags and Members" msgstr "Značky a Členové" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Parent Relations" msgstr "Rodičovské relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 msgid "Child Relations" msgstr "Potomci relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:297 msgid "Apply Role:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "" "There is at least one member in this relation referring
to the " @@ -7514,14 +7524,14 @@ "provést s touto cyklickou závislostí?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "Remove them, clean up relation" msgstr "Odstranit, vyčistit relaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 msgid "Ignore them, leave relation as is" msgstr "Ignorovat, ponechat relaci jak je" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:605 #, java-format msgid "" @@ -7533,9 +7543,9 @@ "''{0}''

Opravdu chcete přidat dalšího člena relace?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:615 msgid "Multiple members referring to same primitive" msgstr "Více členů odkazuje na stejný prvek" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633 #, java-format msgid "" @@ -7548,10 +7558,10 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:674 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "Přidat všechny vybrané prvky z aktuální datové sady před prvního člena" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:700 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -7559,5 +7569,5 @@ "Přidat všechny vybrané prvky z aktuální datové sady za posledního člena" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:727 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7567,5 +7577,5 @@ "člena" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:761 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7575,20 +7585,20 @@ "člena" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 msgid "Remove all members referring to one of the selected primitives" msgstr "Odstranit všechny členy odkazující na některý z vybraných prvků" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:796 msgid "Relation Editor: Remove Selected" msgstr "Editor relací: Odstranit vybrané" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:830 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:842 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "Vybrat členy relace odkazující na prvky v aktuálním výběru" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 #, java-format msgid "" @@ -7597,80 +7607,80 @@ msgstr "Vybrat členy relace odkazující na {0} prvků v aktuálním výběru" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:864 msgid "Select primitives for selected relation members" msgstr "Vybrat prvky pro vybrané členy relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 msgid "Sort the relation members" msgstr "Seřadit členy relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:886 msgid "Sort" msgstr "Řadit" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:887 msgid "Relation Editor: Sort" msgstr "Editor relací: Třídění" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Reverse the order of the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 msgid "Move the currently selected members up" msgstr "Přesunout zvolené členy nahoru" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:933 msgid "Relation Editor: Move Up" msgstr "Editor relací: Posun nahoru" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 msgid "Move the currently selected members down" msgstr "Přesunout zvolené členy dolů" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 msgid "Relation Editor: Move Down" msgstr "Editor relací: Posun dolů" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 msgid "Remove the currently selected members from this relation" msgstr "Odstranit vybrané členy z relace" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 msgid "Relation Editor: Remove" msgstr "Editor relací: Odstranit" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 msgid "Delete the currently edited relation" msgstr "Smazat editovanou relaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 msgid "Yes, create a conflict and close" msgstr "Ano, vytvořit konflikt a zavřít" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1075 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 msgid "No, continue editing" msgstr "Ne, pokračovat v editaci" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1081 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7679,5 +7689,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1105 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 #, java-format msgid "" @@ -7686,47 +7696,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 msgid "Apply the current updates" msgstr "Aplikovat aktuální změny" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 msgid "Apply the updates and close the dialog" msgstr "Aplikovat změny a zavřít dialog" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Cancel the updates and close the dialog" msgstr "Zrušit změny a zavřít dialog" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 msgid "Add an empty tag" msgstr "Přidat prázdnou značku" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 msgid "Download all incomplete members" msgstr "Stáhnout všechny nekompletní členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 msgid "Download Members" msgstr "Stáhnout prvky" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 msgid "Relation Editor: Download Members" msgstr "Editor relací: Stáhnout členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 msgid "Download selected incomplete members" msgstr "Stáhnout vybrané nekompletní členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 msgid "Sets a role for the selected members" msgstr "Nastaví roli pro vybrané členy" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 msgid "Apply Role" msgstr "Aplikovat roli" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7735,25 +7745,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1313 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 msgid "Yes, apply it" msgstr "Ano, aplikovat" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 msgid "No, do not apply" msgstr "Ne, neaplikovat" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 msgid "Confirm empty role" msgstr "Potvrdit prázdnou roli" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 msgid "Edit the relation the currently selected relation member refers to" msgstr "Upravit relaci na kterou odkazuje vybraný člen" @@ -7798,13 +7808,13 @@ msgstr "včetně přímých potomků rodičovské relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92 msgid "Load parent relations" msgstr "Načíst rodičovské relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 msgid "Loading parent relations" msgstr "Nahrávám rodičovské relace" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141 msgid "Edit the currently selected relation" msgstr "Upravit vybranou relaci" @@ -13424,4 +13434,6 @@ "updated as well.

Update plugins now?" msgstr "" +"Aktualizoval jste verzi JOSM.
Pokud chcete předejít potížím, je třeba " +"aktualizovat také pluginy.

Aktualizovat nyní pluginy?" #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:183 @@ -13509,5 +13521,5 @@ #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:406 msgid "Checking plugin preconditions..." -msgstr "" +msgstr "Kontroluji požadavky pluginu..." #: ../core/src/org/openstreetmap/josm/plugins/PluginHandler.java:433 @@ -13651,4 +13663,5 @@ "change it later)" msgstr "" +"Neptat příště se a zapamatovat si volbu (změnit lze v Nastavení -> Pluginy)" #: ../core/src/org/openstreetmap/josm/plugins/PluginInformation.java:69 @@ -13970,5 +13983,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:348 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:353 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -16486,12 +16499,10 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:291 -#, fuzzy msgid "Abort tag editing and close dialog" -msgstr "Aplikovat změny a zavřít dialog" +msgstr "" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:304 -#, fuzzy msgid "Apply edited tags and close dialog" -msgstr "Aplikovat změny a zavřít dialog" +msgstr "" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 @@ -30712,7 +30723,4 @@ msgstr "Sicily - Itálie" -#~ msgid "" -#~ msgstr "" - #~ msgid "Email" #~ msgstr "E-mail" @@ -31846,4 +31854,7 @@ #~ "smazání role těchto prvků.
Opravdu chcete novou roli aplikovat?" +#~ msgid "" +#~ msgstr "" + #~ msgid "Linked" #~ msgstr "Spojený" Index: applications/editors/josm/i18n/po/da.po =================================================================== --- applications/editors/josm/i18n/po/da.po (revision 20093) +++ applications/editors/josm/i18n/po/da.po (revision 20140) @@ -9,6 +9,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-21 09:35+0100\n" -"PO-Revision-Date: 2010-02-18 00:13+0000\n" +"POT-Creation-Date: 2010-02-24 19:46+0100\n" +"PO-Revision-Date: 2010-02-21 11:21+0000\n" "Last-Translator: AJenbo \n" "Language-Team: Dansk \n" @@ -17,5 +17,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-02-21 08:09+0000\n" +"X-Launchpad-Export-Date: 2010-02-24 18:32+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -70,6 +70,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:291 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 @@ -249,5 +249,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -395,5 +395,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -698,5 +698,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:989 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -820,5 +820,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 msgid "Duplicate" msgstr "Duplikér" @@ -1669,6 +1669,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215 msgid "No, abort" @@ -2396,5 +2396,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:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149 @@ -2989,5 +2989,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1111 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 msgid "Double conflict" msgstr "Dobbelt konflikt" @@ -3024,5 +3024,5 @@ #. should not happen #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 msgid "Cannot resolve undecided conflict." msgstr "Kan ikke løse uafklaret konflikt" @@ -3198,10 +3198,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:53 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "Løs konflikter i liste over punkter for vej {0}" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:71 #, java-format msgid "Main dataset does not include node {0}" @@ -3505,27 +3505,27 @@ "ikke en kritisk fejl, så det skulle være sikkert at fortsætte dit arbejde." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:148 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 #, java-format msgid "Missing merge target for way with id {0}" msgstr "Manglende sammenlægningsmål for vej med id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:228 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 #, java-format msgid "Missing merge target for node with id {0}" msgstr "Manglende sammenlægningsmål for punkt med id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Manglende sammenlægningsmål for objekt med id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:243 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "Manglende sammenlægningsmål for relation med id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:248 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3535,5 +3535,5 @@ #. 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:281 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 #, java-format msgid "" @@ -3687,6 +3687,6 @@ "værdier." -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:291 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:313 +#: ../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}." @@ -3805,5 +3805,5 @@ #. darker blue #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:183 msgid "background" @@ -4047,5 +4047,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 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 msgid "Conflict" msgstr "Konflikt" @@ -4302,5 +4302,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:936 #: ../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/dialogs/relation/ReferringRelationsBrowser.java:143 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:209 @@ -4544,14 +4544,14 @@ msgstr "Rolle {0} er ikke involveret i sammenligningspar {1}." -#: ../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/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Egenskaber" -#: ../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/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:235 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:239 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:507 @@ -4560,6 +4560,6 @@ msgstr "Tags" -#: ../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/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4567,16 +4567,16 @@ msgstr "Punkter" -#: ../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:271 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:275 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 msgid "No pending tag conflicts to be resolved" msgstr "Ingen uafklarede tagkonflikter der skal løses" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "Tags({0} conflict)" @@ -4585,5 +4585,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4592,9 +4592,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "Nodes(resolved)" msgstr "Punkter (afklaret)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4603,17 +4603,17 @@ "punktliste" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Nodes(with conflicts)" msgstr "Punkter (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 msgid "Pending conflicts in the node list of this way" msgstr "Uafklarede konflikter i denne vejs punktliste" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:194 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Members(resolved)" msgstr "Medlemmer (afklaret)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4623,25 +4623,25 @@ "relations medlemsliste" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Members(with conflicts)" msgstr "Medlemmer (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending conflicts in the member list of this relation" msgstr "Uafklarede konflikter i denne relations medlemsliste" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 msgid "No pending property conflicts" msgstr "Ingen uafklarede egenskabskonflikter" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:211 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Properties(with conflicts)" msgstr "Egenskaber (med konflikter)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 msgid "Pending property conflicts to be resolved" msgstr "uafklarede egenskabskonflikter der skal løses" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:292 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 msgid "Conflict Resolution" msgstr "Konflikt-løsning" @@ -4687,5 +4687,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 msgid "My version" msgstr "Min version" @@ -4696,6 +4696,6 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" msgstr "Sammenflettet version" @@ -4710,5 +4710,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 msgid "Their version" msgstr "Deres version" @@ -4899,10 +4899,10 @@ msgstr "Punkt" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 msgid "Merged nodes not frozen yet. Cannot build resolution command." msgstr "" "Sammenlagte punkter ikke frosset endnu. Kan ikke opbygge resolutionskommando." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:460 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:463 #, java-format msgid "" @@ -4912,19 +4912,19 @@ "En fejl opstod under kommunikation med serveren
Detaljer: {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 msgid "Communication with server failed" msgstr "Kommunikation med server fejlede" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:540 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:509 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:543 msgid "Yes, undelete them too" msgstr "Ja, gendan også dem" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:507 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:541 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 msgid "No, cancel operation" msgstr "Nej, fortryd handlingen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514 #, java-format msgid "" @@ -4937,9 +4937,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:524 msgid "Undelete additional nodes?" msgstr "Gendan yderligere punkter?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:548 #, java-format msgid "" @@ -4952,13 +4952,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:555 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:558 msgid "Undelete dependent primitives?" msgstr "Gendan afhængige primitiver?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Egenskaber i mit datasæt, f.eks. det lokale datasæt" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "" "Properties in the merged element. They will replace properties in my " @@ -4968,91 +4968,91 @@ "elementer når sammenlægningsbeslutninger er udført." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Egenskaber i deres datasæt, f.eks. server datasættet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 msgid "Coordinates:" msgstr "Koordinater:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 msgid "Deleted State:" msgstr "Slettet status:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 msgid "Visible State:" msgstr "Synlig status:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 msgid "Referenced by:" msgstr "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "ingen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:390 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "slettet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:392 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 msgid "not deleted" msgstr "ikke slettet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 msgid "visible (on the server)" msgstr "synlig (på server)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:401 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 msgid "not visible (on the server)" msgstr "ikke synlig (på server)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 msgid "Keep a clone of the local version" msgstr "Behold en klon af den lokale version." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:410 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 msgid "Physically delete from local dataset" msgstr "Slet fysisk fra lokal datasæt" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:528 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "Behold mine koordinater" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:543 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 msgid "Keep their coordiates" msgstr "Behold deres koordinater" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:558 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 msgid "Undecide conflict between different coordinates" msgstr "Omgør beslutning om konflikt mellem forskellige koordinater" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:573 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 msgid "Keep my deleted state" msgstr "Behold min slettede status" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 msgid "Keep their deleted state" msgstr "Behold deres slettede status" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:603 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 msgid "Undecide conflict between deleted state" msgstr "Omgør beslutning om konflikt mellem slettede status" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 msgid "Keep my visible state" msgstr "Behold min slettede status" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 msgid "Yes, reset the id" msgstr "Ja, nulstil ID" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:638 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 #, java-format msgid "" @@ -5065,17 +5065,17 @@ "ny ID.
Indvilliger du?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:645 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 msgid "Reset id to 0" msgstr "Nulstil ID til 0" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 msgid "Keep their visible state" msgstr "Behold deres synlige status" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:674 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 msgid "Yes, purge it" msgstr "Ja, udrens det" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:679 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 #, java-format msgid "" @@ -5086,9 +5086,9 @@ "datasættet.
Indvilliger du?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:684 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 msgid "Remove from dataset" msgstr "Fjern fra datasæt" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 msgid "Undecide conflict between visible state" msgstr "Omgør beslutning om konflikt mellem synlige status" @@ -5159,25 +5159,25 @@ msgstr "Kan ikke anvende uafklaret tagsamlingsgenstand." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:128 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:129 msgid "My version (local dataset)" msgstr "Min version (lokalt datasæt)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:151 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:152 msgid "Their version (server dataset)" msgstr "Deres version (serverens datasæt)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:275 msgid "Keep the selected key/value pairs from the local dataset" msgstr "Behold de markerede nøgle/værdi par fra det lokale datasæt" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:304 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:305 msgid "Keep the selected key/value pairs from the server dataset" msgstr "Behold de markerede nøgle/værdi par fra serverens datasæt" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:397 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:398 msgid "Undecide" msgstr "Marker som ubesluttet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:400 msgid "Mark the selected tags as undecided" msgstr "Markér de markerede tags som uafklarede" @@ -5220,5 +5220,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 msgid "Apply" msgstr "Anvend" @@ -5549,14 +5549,14 @@ msgstr "Løs konfilkter." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 #, java-format msgid "Conflicts: {0} unresolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:325 msgid "Resolve" msgstr "Løs" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5564,5 +5564,5 @@ "liste." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 @@ -5685,5 +5685,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 @@ -5780,5 +5780,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1365 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5833,5 +5833,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:353 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -7557,5 +7557,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7606,26 +7606,26 @@ msgstr "({0}/{1}): Downloader relation ''{2}''..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 msgid "Tags and Members" msgstr "Tags og medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Parent Relations" msgstr "Forældrerelationer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 msgid "Child Relations" msgstr "Barnerelationer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:297 msgid "Apply Role:" msgstr "Anvend rolle:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299 msgid "Enter a role and apply it to the selected relation members" msgstr "Indtast en rolle og brug den med de markerede relationsmedlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "" "There is at least one member in this relation referring
to the " @@ -7637,14 +7637,14 @@ "
Hvordan ønsker du at fortsætte med cirkulære afhængigheder?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "Remove them, clean up relation" msgstr "Fjern dem og ryd op i relationen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 msgid "Ignore them, leave relation as is" msgstr "Ignorer dem og lad relationen være som den er." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:605 #, java-format msgid "" @@ -7657,9 +7657,9 @@ "relationsmedlem?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:615 msgid "Multiple members referring to same primitive" msgstr "Flere medlemmer der refererer til samme primitiv." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633 #, java-format msgid "" @@ -7672,5 +7672,5 @@ "''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:674 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -7678,5 +7678,5 @@ "Tilføj alle primitiver markeret i det nuværende datasæt før det første medlem" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:700 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -7685,5 +7685,5 @@ "medlem" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:727 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7693,5 +7693,5 @@ "markerede medlem" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:761 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7701,15 +7701,15 @@ "markerede medlem" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 msgid "Remove all members referring to one of the selected primitives" msgstr "Fjern alle medlemmer der refererer til en af de markerede primitiver" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:796 msgid "Relation Editor: Remove Selected" msgstr "Relationseditor: Fjern markerede" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:830 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:842 msgid "" "Select relation members which refer to primitives in the current selection" @@ -7718,5 +7718,5 @@ "markering" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 #, java-format msgid "" @@ -7727,80 +7727,80 @@ "markering" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:864 msgid "Select primitives for selected relation members" msgstr "Markér primitiver for markerede relationsmedlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 msgid "Sort the relation members" msgstr "Sortér relationsmedlemmerne" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:886 msgid "Sort" msgstr "Sortér" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:887 msgid "Relation Editor: Sort" msgstr "Relationseditor: Sortér" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Reverse the order of the relation members" msgstr "Reversér relationsmedlemmernes rækkefølge" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909 msgid "Reverse" msgstr "Omvendt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Reverse" msgstr "Relationseditor: Reversér" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 msgid "Move the currently selected members up" msgstr "Flyt de nu markerede medlemmer op" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:933 msgid "Relation Editor: Move Up" msgstr "Relationseditor: Flyt op" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 msgid "Move the currently selected members down" msgstr "Flyt de nu markerede medlemmer ned" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 msgid "Relation Editor: Move Down" msgstr "Relationseditor: Flyt ned" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 msgid "Remove the currently selected members from this relation" msgstr "Fjern de nu markerede medlemmer fra denne relation" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 msgid "Relation Editor: Remove" msgstr "Relationseditor: Fjern" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 msgid "Delete the currently edited relation" msgstr "Slet den redigerede relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 msgid "Yes, create a conflict and close" msgstr "Ja, opret en konflikt og luk" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1075 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 msgid "Click to create a conflict and close this relation editor" msgstr "Klik for at oprette en konflikt og lukke denne relationseditor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 msgid "No, continue editing" msgstr "Nej, fortsæt redigeringen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1081 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7812,5 +7812,5 @@ "oprette en konflikt og lukke editoren?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1105 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 #, java-format msgid "" @@ -7821,47 +7821,47 @@ "venligst denne konflikt først og prøv så igen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 msgid "Apply the current updates" msgstr "Tilføj de aktuelle opdateringer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 msgid "Apply the updates and close the dialog" msgstr "Tilføj opdateringerne og luk dialogboksen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Cancel the updates and close the dialog" msgstr "Annullér opdateringerne og luk dialogen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 msgid "Add an empty tag" msgstr "Tilføj en tom tag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 msgid "Download all incomplete members" msgstr "Download alle ufuldstændige medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 msgid "Download Members" msgstr "Download medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 msgid "Relation Editor: Download Members" msgstr "Relationseditor: Download medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 msgid "Download selected incomplete members" msgstr "Download markerede ufuldstændige medlemmer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 msgid "Sets a role for the selected members" msgstr "Giver de markerede medlemmer en rolle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 msgid "Apply Role" msgstr "Anvend rolle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7870,25 +7870,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 msgid "Do you really want to apply the new role?" msgstr "Vil du virkelig anvende den nye rolle?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1313 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 msgid "Yes, apply it" msgstr "Ja, anvend den" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 msgid "No, do not apply" msgstr "Nej, anvend den ikke" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 msgid "Confirm empty role" msgstr "Bekræft tom rolle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 msgid "Edit the relation the currently selected relation member refers to" msgstr "Redigér den relation det nu markerede relationsmedlem refererer til" @@ -7934,13 +7934,13 @@ msgstr "Inkluderer umiddelbare børn af forældrerelationer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92 msgid "Load parent relations" msgstr "Hent forældrerelationer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 msgid "Loading parent relations" msgstr "Henter forældrerelationer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141 msgid "Edit the currently selected relation" msgstr "Rediger den nu markerede relation" @@ -14229,5 +14229,5 @@ "

Fejlmeddelelsen er:
{0}" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:348 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:353 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -16726,12 +16726,10 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:291 -#, fuzzy msgid "Abort tag editing and close dialog" -msgstr "Tilføj opdateringerne og luk dialogboksen" +msgstr "" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:304 -#, fuzzy msgid "Apply edited tags and close dialog" -msgstr "Tilføj opdateringerne og luk dialogboksen" +msgstr "" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 @@ -30987,7 +30985,4 @@ msgstr "Sicilen - Italien" -#~ msgid "" -#~ msgstr "" - #~ msgid "Move" #~ msgstr "Flyt" @@ -32185,4 +32180,7 @@ #~ msgstr "Åbn" +#~ msgid "" +#~ msgstr "" + #~ msgid "Delete old plugin file {0}" #~ msgstr "Slet gammel udvidelsesfil {0}" Index: applications/editors/josm/i18n/po/de.po =================================================================== --- applications/editors/josm/i18n/po/de.po (revision 20093) +++ applications/editors/josm/i18n/po/de.po (revision 20140) @@ -9,7 +9,7 @@ "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-21 09:35+0100\n" -"PO-Revision-Date: 2010-02-20 19:30+0000\n" -"Last-Translator: Andre Hinrichs \n" +"POT-Creation-Date: 2010-02-24 19:46+0100\n" +"PO-Revision-Date: 2010-02-24 14:41+0000\n" +"Last-Translator: Dirk Stöcker \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -17,5 +17,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-02-21 08:17+0000\n" +"X-Launchpad-Export-Date: 2010-02-24 18:25+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -70,6 +70,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:291 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 @@ -250,5 +250,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -398,5 +398,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -702,5 +702,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:989 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -824,5 +824,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 msgid "Duplicate" msgstr "Duplizieren" @@ -1688,6 +1688,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215 msgid "No, abort" @@ -2433,5 +2433,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:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149 @@ -3038,5 +3038,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1111 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 msgid "Double conflict" msgstr "Doppelter Konflikt" @@ -3073,5 +3073,5 @@ #. should not happen #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 msgid "Cannot resolve undecided conflict." msgstr "Kann unentschiedenen Konflikt nicht auflösen" @@ -3249,10 +3249,10 @@ msgstr "Versionskonflikt für Relation {0} auflösen" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:53 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "Konflikte in der Knotenliste des Weges {0} auflösen" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:71 #, java-format msgid "Main dataset does not include node {0}" @@ -3564,6 +3564,6 @@ "JOSM fortsetzen können." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:148 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 #, java-format msgid "Missing merge target for way with id {0}" @@ -3571,6 +3571,6 @@ "Beim Zusammenführen wurde der Ziel-Weg für den Weg mit ID {0} nicht gefunden" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:228 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 #, java-format msgid "Missing merge target for node with id {0}" @@ -3579,5 +3579,5 @@ "gefunden" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for object with id {0}" @@ -3586,5 +3586,5 @@ "gefunden" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:243 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 #, java-format msgid "Missing merge target for relation with id {0}" @@ -3593,5 +3593,5 @@ "nicht gefunden" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:248 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3603,5 +3603,5 @@ #. 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:281 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 #, java-format msgid "" @@ -3755,6 +3755,6 @@ "Schlüssel mit mehreren Werten enthält." -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:291 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:313 +#: ../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}." @@ -3876,5 +3876,5 @@ #. darker blue #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:183 msgid "background" @@ -4120,5 +4120,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 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 msgid "Conflict" msgstr "Konflikt" @@ -4382,5 +4382,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:936 #: ../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/dialogs/relation/ReferringRelationsBrowser.java:143 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:209 @@ -4628,14 +4628,14 @@ msgstr "Role {0} nimmt nicht an dem Vergleichspaar {1} teil." -#: ../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/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Eigenschaften" -#: ../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/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:235 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:239 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:507 @@ -4644,6 +4644,6 @@ msgstr "Merkmale" -#: ../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/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4651,16 +4651,16 @@ msgstr "Knoten" -#: ../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:271 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:275 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Elemente" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 msgid "No pending tag conflicts to be resolved" msgstr "Keine verbleibenden Merkmalskonflikte zu beheben" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "Tags({0} conflict)" @@ -4669,5 +4669,5 @@ msgstr[1] "Merkmale ({0} Konflikte)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4676,9 +4676,9 @@ msgstr[1] "{0} verbleibende Merkmalskonflikte zu beheben" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "Nodes(resolved)" msgstr "Knoten(gelöst)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4687,17 +4687,17 @@ "Knotenliste des Weges." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Nodes(with conflicts)" msgstr "Knoten(mit Konflikten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 msgid "Pending conflicts in the node list of this way" msgstr "Verbleibende Konflikte in der Knotenliste des Weges" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:194 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Members(resolved)" msgstr "Elemente(gelöst)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4707,25 +4707,25 @@ "Elementenliste der Relation." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Members(with conflicts)" msgstr "Elemente(mit Konflikten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending conflicts in the member list of this relation" msgstr "Verbleibende Konflikte in der Elementenliste der Relation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 msgid "No pending property conflicts" msgstr "Keine verbleibenden Eigenschaftskonflikte" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:211 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Properties(with conflicts)" msgstr "Eigenschaften(mit Konflikten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 msgid "Pending property conflicts to be resolved" msgstr "Verbleibende Eigenschaftskonflikte zu beheben" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:292 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 msgid "Conflict Resolution" msgstr "Konfliktlösung" @@ -4773,5 +4773,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 msgid "My version" msgstr "Meine Version" @@ -4782,6 +4782,6 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" msgstr "Vereinigte Version" @@ -4796,5 +4796,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 msgid "Their version" msgstr "Deren Version" @@ -4868,9 +4868,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:643 msgid "Copy all my elements to the target" -msgstr "" +msgstr "Alle lokalen Werte ins Ziel kopieren" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:669 msgid "Copy all their elements to the target" -msgstr "" +msgstr "Alle Serverwerte ins Ziel kopieren" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 @@ -4980,5 +4980,5 @@ msgstr "Knoten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 msgid "Merged nodes not frozen yet. Cannot build resolution command." msgstr "" @@ -4986,5 +4986,5 @@ "ausgeführt werden." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:460 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:463 #, java-format msgid "" @@ -4994,19 +4994,19 @@ "Fehler bei der Kommunikation mit dem Server
Details: {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 msgid "Communication with server failed" msgstr "Fehler bei der Kommunikation mit dem Server" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:540 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:509 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:543 msgid "Yes, undelete them too" msgstr "Ja, auch wiederherstellen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:507 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:541 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 msgid "No, cancel operation" msgstr "Nein, Operation abbrechen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514 #, java-format msgid "" @@ -5024,9 +5024,9 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:524 msgid "Undelete additional nodes?" msgstr "Zusätzliche Knoten wiederherstellen?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:548 #, java-format msgid "" @@ -5045,13 +5045,13 @@ "auch wiederhergestellt werden?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:555 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:558 msgid "Undelete dependent primitives?" msgstr "Abhängige Objekte wiederherstellen?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Eigenschaften in meinem Datensatz (lokaler Datensatz)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5061,91 +5061,91 @@ "eigenen Elements ersetzen, wenn die Vereinigung angewendet wird." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Eigenschaften in deren Datensatz (Serverdatensatz)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 msgid "Coordinates:" msgstr "Koordinaten:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 msgid "Deleted State:" msgstr "Löschstatus:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 msgid "Visible State:" msgstr "Löschstatus:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 msgid "Referenced by:" msgstr "Referenziert durch:" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(nichts)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:390 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "gelöscht" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:392 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 msgid "not deleted" msgstr "nicht gelöscht" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 msgid "visible (on the server)" msgstr "sichtbar (auf Server)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:401 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 msgid "not visible (on the server)" msgstr "nicht sichtbar (auf dem Server)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 msgid "Keep a clone of the local version" msgstr "Exakte Kopie der lokalen Version behalten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:410 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 msgid "Physically delete from local dataset" msgstr "Aus dem lokalen Datensatz löschen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:528 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "Behalte meine Koordinaten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:543 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 msgid "Keep their coordiates" msgstr "Server-Koordinaten behalten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:558 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 msgid "Undecide conflict between different coordinates" msgstr "Nicht aufgelöster Konflikt durch unterschiedliche Koordinaten." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:573 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 msgid "Keep my deleted state" msgstr "Löschstatus der lokalen Daten behalten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 msgid "Keep their deleted state" msgstr "Löschstatus der Server-Daten behalten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:603 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 msgid "Undecide conflict between deleted state" msgstr "Nicht aufgelöster Konflikt durch unterschiedlichen Löschstatus." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 msgid "Keep my visible state" msgstr "Übernehme meinen Löschstatus" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 msgid "Yes, reset the id" msgstr "Ja, diese ID zurücksetzten" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:638 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 #, java-format msgid "" @@ -5158,17 +5158,17 @@ "zuweisen.
Möchten Sie fortfahren?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:645 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 msgid "Reset id to 0" msgstr "ID auf 0 zurücksetzen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 msgid "Keep their visible state" msgstr "Übernehme deren Löschstatus" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:674 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 msgid "Yes, purge it" msgstr "Ja, entfernen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:679 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 #, java-format msgid "" @@ -5179,9 +5179,9 @@ "damit einverstanden?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:684 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 msgid "Remove from dataset" msgstr "Aus dem Datensatz löschen" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 msgid "Undecide conflict between visible state" msgstr "Löschstatus ist unterschiedlich." @@ -5253,25 +5253,25 @@ msgstr "Unentschiedenes Merkmalselement kann nicht angewendet werden." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:128 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:129 msgid "My version (local dataset)" msgstr "Meine Version (lokale Daten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:151 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:152 msgid "Their version (server dataset)" msgstr "Deren Version (Serverdaten)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:275 msgid "Keep the selected key/value pairs from the local dataset" msgstr "Behalte die ausgewählten Schlüssel/Wert-Kombination der lokalen Daten." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:304 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:305 msgid "Keep the selected key/value pairs from the server dataset" msgstr "Behalte die ausgewählten Schlüssel/Wert-Kombination der Server-Daten." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:397 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:398 msgid "Undecide" msgstr "Unentschieden" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:400 msgid "Mark the selected tags as undecided" msgstr "Gewähltes Merkmal als unentschieden markieren" @@ -5314,5 +5314,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 msgid "Apply" msgstr "Übernehmen" @@ -5650,18 +5650,18 @@ msgstr "Konflikte auflösen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 #, java-format msgid "Conflicts: {0} unresolved" msgstr "Konflikte: {0} ungelöst" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:325 msgid "Resolve" msgstr "Auflösen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326 msgid "Open a merge dialog of all selected items in the list above." msgstr "Dialog-Fenster mit den gewählten Objekten aus der obigen Liste öffnen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 @@ -5790,5 +5790,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 @@ -5885,5 +5885,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1365 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5939,5 +5939,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:353 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -7678,5 +7678,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7728,27 +7728,27 @@ msgstr "({0}/{1}: Relation ''{2}'' herunterladen..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 msgid "Tags and Members" msgstr "Merkmale und Elemente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Parent Relations" msgstr "Eltern-Relationen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 msgid "Child Relations" msgstr "Kind-Relationen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:297 msgid "Apply Role:" msgstr "Rolle anwenden:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299 msgid "Enter a role and apply it to the selected relation members" msgstr "" "Eine Rolle eingeben und diese auf die gewählten Relationsmitglieder anwenden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "" "There is at least one member in this relation referring
to the " @@ -7760,14 +7760,14 @@ "Sie die zirkuläre Abhängigkeit behandeln?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "Remove them, clean up relation" msgstr "Objekt entfernen und Verbindung lösen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 msgid "Ignore them, leave relation as is" msgstr "Ignorieren und die aktuelle Verbindung belassen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:605 #, java-format msgid "" @@ -7779,9 +7779,9 @@ "

Wollen Sie es ein weiteres Mal in die Relation aufnehmen?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:615 msgid "Multiple members referring to same primitive" msgstr "Mehrere Elemente verweisen auf das gleiche Objekt" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633 #, java-format msgid "" @@ -7794,5 +7794,5 @@ "Relation ''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:674 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -7801,5 +7801,5 @@ "hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:700 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -7808,5 +7808,5 @@ "hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:727 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7816,5 +7816,5 @@ "ausgewählten Element hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:761 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7824,20 +7824,20 @@ "ausgewählten Element hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 msgid "Remove all members referring to one of the selected primitives" msgstr "Alle Elemente mit Verweis zu einem der ausgewählten Objekte entfernen" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:796 msgid "Relation Editor: Remove Selected" msgstr "Relations-Editor: Ausgewählte entfernen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:830 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:842 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "Alle Elemente auswählen, die in der aktuellen Auswahl vorkommen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 #, java-format msgid "" @@ -7848,68 +7848,68 @@ "vorkommen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:864 msgid "Select primitives for selected relation members" msgstr "Objekte für gewählte Relationselemente auswählen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 msgid "Sort the relation members" msgstr "Relationselemente sortieren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:886 msgid "Sort" msgstr "Sortieren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:887 msgid "Relation Editor: Sort" msgstr "Relations-Editor: Sortieren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Reverse the order of the relation members" msgstr "Die Reihenfolge der Relationselemente umdrehen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909 msgid "Reverse" msgstr "Umkehren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Reverse" msgstr "Relationseditor: Umkehren" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 msgid "Move the currently selected members up" msgstr "Ausgewählte Elemente nach oben schieben" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:933 msgid "Relation Editor: Move Up" msgstr "Relations-Editor: Nach oben verschieben" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 msgid "Move the currently selected members down" msgstr "Ausgewählte Elemente nach unten schieben" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 msgid "Relation Editor: Move Down" msgstr "Relations-Editor: Nach unten verschieben" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 msgid "Remove the currently selected members from this relation" msgstr "Das ausgewählte Element aus dieser Relation entfernen" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 msgid "Relation Editor: Remove" msgstr "Relations-Editor: Entfernen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 msgid "Delete the currently edited relation" msgstr "Diese Relation löschen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 msgid "Yes, create a conflict and close" msgstr "Konflikt erstellen und schließen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1075 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 msgid "Click to create a conflict and close this relation editor" msgstr "" @@ -7917,9 +7917,9 @@ "schließen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 msgid "No, continue editing" msgstr "Bearbeitung fortsetzen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1081 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" @@ -7927,5 +7927,5 @@ "Relation wiederaufzunehmen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7937,5 +7937,5 @@ "

Soll ein Konflikt erstellt und der Editor geschlossen werden?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1105 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 #, java-format msgid "" @@ -7946,47 +7946,47 @@ "Element
''{1}''.
Bitte lösen Sie diesen Konflikt zunächst auf." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 msgid "Apply the current updates" msgstr "Aktualisierung übernehmen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 msgid "Apply the updates and close the dialog" msgstr "Updates anwenden und den Dialog schliessen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Cancel the updates and close the dialog" msgstr "Updates abbrechen und den Dialog schliessen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 msgid "Add an empty tag" msgstr "Einen leeren Schlüssel hinzufügen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 msgid "Download all incomplete members" msgstr "Alle unvollständigen Mitglieder herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 msgid "Download Members" msgstr "Elemente herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 msgid "Relation Editor: Download Members" msgstr "Relations-Editor: Elemente herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 msgid "Download selected incomplete members" msgstr "Ausgewählte unvollständige Mitglieder herunterladen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 msgid "Sets a role for the selected members" msgstr "Definiert eine Rolle für die ausgewählten Elemente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 msgid "Apply Role" msgstr "Rolle anwenden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7995,25 +7995,25 @@ msgstr[1] "Eine leere Rolle wird {0} Objekten zugewiesen." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "This is equal to deleting the roles of these primitives." msgstr "Dies ist equivalent zum Löschen der Rollen für diese Objekte." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 msgid "Do you really want to apply the new role?" msgstr "Soll die neue Rolle wirklich zugewiesen werden?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1313 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 msgid "Yes, apply it" msgstr "Übernehmen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 msgid "No, do not apply" msgstr "Nicht übernehmen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 msgid "Confirm empty role" msgstr "Leere Rolle bestätigen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 msgid "Edit the relation the currently selected relation member refers to" msgstr "Die zugehörige Relation des ausgewählten Relationselements bearbeiten" @@ -8062,13 +8062,13 @@ msgstr "Direkte Kinder von Elternrelationen einbeziehen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92 msgid "Load parent relations" msgstr "Lade Elternrelationen" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 msgid "Loading parent relations" msgstr "Elternrelationen laden" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141 msgid "Edit the currently selected relation" msgstr "Die ausgewählte Relation bearbeiten" @@ -12772,5 +12772,5 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TableCellRenderer.java:64 msgid "multiple" -msgstr "" +msgstr "mehrere" #: ../core/src/org/openstreetmap/josm/gui/tagging/TagEditorModel.java:424 @@ -13230,4 +13230,6 @@ "zip file ''{0}''. Exception was: {1}" msgstr "" +"Warnung: Fehler beim Öffnen der Datei mit Endung ''{2}'' and Namensteil " +"''{3}'' in Zipdatei ''{0}''. Die Fehlermeldung lautet: {1}" #: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114 @@ -14722,5 +14724,5 @@ "

Die Fehlermeldung lautet:
{0}" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:348 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:353 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15393,5 +15395,5 @@ #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:127 msgid "Image zoom interpolation:" -msgstr "" +msgstr "Bildzoomstufeninterpolation:" #: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:129 @@ -17330,12 +17332,10 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:291 -#, fuzzy msgid "Abort tag editing and close dialog" -msgstr "Updates anwenden und den Dialog schliessen" +msgstr "Merkmalsbearbeitung abbrechen und Dialog schließen" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:304 -#, fuzzy msgid "Apply edited tags and close dialog" -msgstr "Updates anwenden und den Dialog schliessen" +msgstr "Geänderte Merkmale anwenden und Dialog schließen" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 @@ -17513,13 +17513,13 @@ #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 msgid "Tracer" -msgstr "" +msgstr "Abzeichner" #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:44 msgid "Tracer." -msgstr "" +msgstr "Abzeichner." #: ../plugins/tracer/src/org/openstreetmap/josm/plugins/tracer/TracerAction.java:136 msgid "Tracer building" -msgstr "" +msgstr "Gebäude abzeichnen" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:37 @@ -19061,4 +19061,6 @@ "to be running." msgstr "" +"Gebäude von der tschechischen Katasterkarte abzeichnen. TracerServer (.NET " +"oder Mono) muss dazu laufen." #. Plugin validator @@ -31629,7 +31631,4 @@ msgstr "Sizilien - Italien" -#~ msgid "" -#~ msgstr "" - #~ msgid "image" #~ msgid_plural "images" @@ -31790,4 +31789,7 @@ #~ msgid "Edit Difficult Alpine Hiking" #~ msgstr "Schweren alpinen Wanderweg bearbeiten" + +#~ msgid "" +#~ msgstr "" #~ msgid "More details" Index: applications/editors/josm/i18n/po/el.po =================================================================== --- applications/editors/josm/i18n/po/el.po (revision 20093) +++ applications/editors/josm/i18n/po/el.po (revision 20140) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-21 09:35+0100\n" -"PO-Revision-Date: 2010-02-18 16:47+0000\n" +"POT-Creation-Date: 2010-02-24 19:46+0100\n" +"PO-Revision-Date: 2010-02-22 19:27+0000\n" "Last-Translator: aitolos \n" "Language-Team: Greek \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-02-21 08:09+0000\n" +"X-Launchpad-Export-Date: 2010-02-24 18:25+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -69,6 +69,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:291 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 @@ -242,5 +242,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -386,5 +386,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -663,5 +663,5 @@ #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:272 msgid "Create Circle" -msgstr "Δημιουργλια Κύκλου" +msgstr "Δημιουργία Κύκλου" #: ../core/src/org/openstreetmap/josm/actions/CreateCircleAction.java:44 @@ -688,5 +688,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:989 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -811,5 +811,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 msgid "Duplicate" msgstr "Αντιγραφή" @@ -1137,5 +1137,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 msgid "Please select at least one node or way." -msgstr "" +msgstr "Παρακαλώ επιλέξτε τουλάχιστον ενα κόμβο ή κατεύθυνση" #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 @@ -1300,5 +1300,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:81 msgid "Orthogonalize Shape / Undo" -msgstr "" +msgstr "Ορθογωνισμός Σχήματος / Αναίρεση" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:80 @@ -1308,5 +1308,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:101 msgid "Orthogonalize / Undo" -msgstr "" +msgstr "Ορθογωνισμός / Αναίρεση" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:108 @@ -1319,5 +1319,5 @@ #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:110 msgid "Undo Orthogonalize Shape" -msgstr "" +msgstr "Αναίρεση Ορθογωνισμού Σχήματος" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:120 @@ -1652,6 +1652,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215 msgid "No, abort" @@ -2356,5 +2356,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:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149 @@ -2913,5 +2913,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1111 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 msgid "Double conflict" msgstr "" @@ -2944,5 +2944,5 @@ #. should not happen #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 msgid "Cannot resolve undecided conflict." msgstr "" @@ -3116,10 +3116,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:53 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:71 #, java-format msgid "Main dataset does not include node {0}" @@ -3394,27 +3394,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:148 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:228 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:243 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:248 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3424,5 +3424,5 @@ #. 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:281 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 #, java-format msgid "" @@ -3567,6 +3567,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:291 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:313 +#: ../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}." @@ -3684,5 +3684,5 @@ #. darker blue #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:183 msgid "background" @@ -3924,5 +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 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 msgid "Conflict" msgstr "Διένεξη" @@ -4170,5 +4170,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:936 #: ../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/dialogs/relation/ReferringRelationsBrowser.java:143 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:209 @@ -4403,14 +4403,14 @@ msgstr "" -#: ../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/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Ιδιότητες" -#: ../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/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:235 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:239 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:507 @@ -4419,6 +4419,6 @@ msgstr "Ετικέτες" -#: ../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/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4426,16 +4426,16 @@ msgstr "Κόμβοι" -#: ../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:271 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:275 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Μέλη" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "Tags({0} conflict)" @@ -4444,5 +4444,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4451,26 +4451,26 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 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:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:194 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4478,25 +4478,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:211 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:292 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 msgid "Conflict Resolution" msgstr "Επίλυση σύγκρουσης" @@ -4542,5 +4542,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 msgid "My version" msgstr "Η έκδοση μου" @@ -4551,6 +4551,6 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" msgstr "Συγχωνευμένη έκδοση" @@ -4563,5 +4563,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 msgid "Their version" msgstr "Η έκδοση τους" @@ -4733,9 +4733,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 msgid "Merged nodes not frozen yet. Cannot build resolution command." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:460 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:463 #, java-format msgid "" @@ -4744,19 +4744,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 msgid "Communication with server failed" msgstr "Η επικοινωνία με τον διακομιστή απέτυχε" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:540 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:509 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:543 msgid "Yes, undelete them too" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:507 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:541 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 msgid "No, cancel operation" msgstr "Όχι, ακύρωση της λειτουργίας" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514 #, java-format msgid "" @@ -4769,9 +4769,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:524 msgid "Undelete additional nodes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:548 #, java-format msgid "" @@ -4784,13 +4784,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:555 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:558 msgid "Undelete dependent primitives?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "" "Properties in the merged element. They will replace properties in my " @@ -4798,91 +4798,91 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 msgid "Coordinates:" msgstr "Συντεταγμένες:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 msgid "Referenced by:" msgstr "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(κανένα)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:390 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "διαγράφηκε" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:392 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 msgid "not deleted" msgstr "μη διεγραμένο" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 msgid "visible (on the server)" msgstr "ορατό (στον διακομιστή)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:401 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 msgid "not visible (on the server)" msgstr "μη ορατό (στον διακομιστή)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 msgid "Keep a clone of the local version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:410 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:528 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "Διατήρηση των συντεταγμένων μου" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:543 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 msgid "Keep their coordiates" msgstr "Διατήρηση των συντεταγμένων τους" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:558 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:573 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:603 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:638 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 #, java-format msgid "" @@ -4892,17 +4892,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:645 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 msgid "Reset id to 0" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 msgid "Keep their visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:674 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 msgid "Yes, purge it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:679 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 #, java-format msgid "" @@ -4911,9 +4911,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:684 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 msgid "Remove from dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 msgid "Undecide conflict between visible state" msgstr "" @@ -4983,25 +4983,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:128 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:129 msgid "My version (local dataset)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:151 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:152 msgid "Their version (server dataset)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:275 msgid "Keep the selected key/value pairs from the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:304 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:305 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:397 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:398 msgid "Undecide" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:400 msgid "Mark the selected tags as undecided" msgstr "" @@ -5044,5 +5044,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 msgid "Apply" msgstr "" @@ -5349,14 +5349,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 #, java-format msgid "Conflicts: {0} unresolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:325 msgid "Resolve" msgstr "Επίλυση" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5364,5 +5364,5 @@ "λίστα." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 @@ -5483,5 +5483,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 @@ -5578,5 +5578,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1365 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5630,5 +5630,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:353 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -7318,5 +7318,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7365,26 +7365,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 msgid "Tags and Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Parent Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:297 msgid "Apply Role:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "" "There is at least one member in this relation referring
to the " @@ -7393,14 +7393,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:605 #, java-format msgid "" @@ -7410,9 +7410,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:615 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633 #, java-format msgid "" @@ -7422,15 +7422,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:674 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:700 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:727 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7438,5 +7438,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:761 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7444,20 +7444,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:796 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:830 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:842 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 #, java-format msgid "" @@ -7466,80 +7466,80 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:864 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:886 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:887 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Reverse the order of the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 msgid "Move the currently selected members up" msgstr "Μετακίνηση των επιλεγμένων μελών πάνω" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:933 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 msgid "Move the currently selected members down" msgstr "Μετακίνηση των επιλεγμένων μελών κάτω" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1075 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1081 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7548,5 +7548,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1105 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 #, java-format msgid "" @@ -7555,47 +7555,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 msgid "Download Members" msgstr "Λήψη μελών" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +msgid "Relation Editor: Download Members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 -msgid "Relation Editor: Download Members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7604,25 +7604,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1313 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -7667,13 +7667,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92 msgid "Load parent relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 msgid "Loading parent relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141 msgid "Edit the currently selected relation" msgstr "" @@ -13677,5 +13677,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:348 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:353 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -16160,7 +16160,6 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:304 -#, fuzzy msgid "Apply edited tags and close dialog" -msgstr "Εφαρμογή επίλυσης συγκρούσεων και κλείσιμο του διαλόγου" +msgstr "" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 @@ -30333,7 +30332,4 @@ msgstr "" -#~ msgid "" -#~ msgstr "<πολλαπλές>" - #~ msgid "Do not show again" #~ msgstr "Να μην εμφανιστεί ξανά" @@ -31035,4 +31031,7 @@ #~ msgstr "Άνοιγμα εικόνων με το AgPifoJ..." +#~ msgid "" +#~ msgstr "<πολλαπλές>" + #~ msgid "Continue anyway" #~ msgstr "Συνέχεια έτσι κι αλλιώς" Index: applications/editors/josm/i18n/po/en_GB.po =================================================================== --- applications/editors/josm/i18n/po/en_GB.po (revision 20093) +++ applications/editors/josm/i18n/po/en_GB.po (revision 20140) @@ -11,7 +11,7 @@ "Project-Id-Version: JOSM\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-21 09:35+0100\n" -"PO-Revision-Date: 2010-02-18 17:18+0000\n" -"Last-Translator: Bruce Cowan \n" +"POT-Creation-Date: 2010-02-24 19:46+0100\n" +"PO-Revision-Date: 2010-02-21 10:08+0000\n" +"Last-Translator: bastik \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -19,5 +19,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-02-21 08:13+0000\n" +"X-Launchpad-Export-Date: 2010-02-24 18:32+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -72,6 +72,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:291 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 @@ -251,5 +251,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -397,5 +397,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -701,5 +701,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:989 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -823,5 +823,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 msgid "Duplicate" msgstr "Duplicate" @@ -1679,6 +1679,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215 msgid "No, abort" @@ -2407,5 +2407,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:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149 @@ -2992,5 +2992,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1111 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 msgid "Double conflict" msgstr "Double conflict" @@ -3026,5 +3026,5 @@ #. should not happen #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 msgid "Cannot resolve undecided conflict." msgstr "cannot resolve undecided conflict" @@ -3200,10 +3200,10 @@ msgstr "Resolve version conflict for relation {0}" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:53 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "Resolve conflicts in node list of way {0}" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:71 #, java-format msgid "Main dataset does not include node {0}" @@ -3507,27 +3507,27 @@ "error, it should be safe to continue in your work." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:148 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 #, java-format msgid "Missing merge target for way with id {0}" msgstr "Missing merge target for way with id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:228 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 #, java-format msgid "Missing merge target for node with id {0}" msgstr "Missing merge target for node with id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Missing merge target for object with id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:243 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "Missing merge target for relation with id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:248 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3537,5 +3537,5 @@ #. 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:281 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 #, java-format msgid "" @@ -3690,6 +3690,6 @@ "multiple values." -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:291 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:313 +#: ../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}." @@ -3807,5 +3807,5 @@ #. darker blue #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:183 msgid "background" @@ -4050,5 +4050,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 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 msgid "Conflict" msgstr "Conflict" @@ -4306,5 +4306,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:936 #: ../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/dialogs/relation/ReferringRelationsBrowser.java:143 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:209 @@ -4548,14 +4548,14 @@ msgstr "role {0} is not participating in compare pair {1}" -#: ../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/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Properties" -#: ../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/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:235 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:239 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:507 @@ -4564,6 +4564,6 @@ msgstr "Tags" -#: ../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/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4571,16 +4571,16 @@ msgstr "Nodes" -#: ../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:271 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:275 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Members" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 msgid "No pending tag conflicts to be resolved" msgstr "No pending tag conflicts to be resolved" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "Tags({0} conflict)" @@ -4589,5 +4589,5 @@ msgstr[1] "Tags({0} conflicts)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4596,9 +4596,9 @@ msgstr[1] "{0} pending tag conflicts to be resolved" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "Nodes(resolved)" msgstr "Nodes(resolved)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4606,17 +4606,17 @@ "Merged node list frozen. No pending conflicts in the node list of this way" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Nodes(with conflicts)" msgstr "Nodes(with conflicts)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 msgid "Pending conflicts in the node list of this way" msgstr "Pending conflicts in the node list of this way" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:194 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Members(resolved)" msgstr "Members(resolved)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4626,25 +4626,25 @@ "relation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Members(with conflicts)" msgstr "Members(with conflicts)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending conflicts in the member list of this relation" msgstr "Pending conflicts in the member list of this relation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 msgid "No pending property conflicts" msgstr "No pending property conflicts" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:211 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Properties(with conflicts)" msgstr "Properties(with conflicts)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 msgid "Pending property conflicts to be resolved" msgstr "Pending property conflicts to be resolved" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:292 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 msgid "Conflict Resolution" msgstr "Conflict Resolution" @@ -4690,5 +4690,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 msgid "My version" msgstr "My version" @@ -4699,6 +4699,6 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" msgstr "Merged version" @@ -4713,5 +4713,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 msgid "Their version" msgstr "Their version" @@ -4894,9 +4894,9 @@ msgstr "Node" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 msgid "Merged nodes not frozen yet. Cannot build resolution command." msgstr "Merged nodes not frozen yet. Cannot build resolution command." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:460 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:463 #, java-format msgid "" @@ -4907,19 +4907,19 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 msgid "Communication with server failed" msgstr "Communication with server failed" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:540 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:509 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:543 msgid "Yes, undelete them too" msgstr "Yes, undelete them too" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:507 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:541 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 msgid "No, cancel operation" msgstr "No, cancel operation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514 #, java-format msgid "" @@ -4936,9 +4936,9 @@ "server.

Do you want to undelete these nodes too?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:524 msgid "Undelete additional nodes?" msgstr "Undelete additional nodes?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:548 #, java-format msgid "" @@ -4955,13 +4955,13 @@ "deleted on the server.

Do you want to undelete them too?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:555 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:558 msgid "Undelete dependent primitives?" msgstr "Undelete dependent primitives?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Properties in my dataset, i.e. the local dataset" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "" "Properties in the merged element. They will replace properties in my " @@ -4971,91 +4971,91 @@ "elements when merge decisions are applied." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Properties in their dataset, i.e. the server dataset" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 msgid "Coordinates:" msgstr "Coordinates:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 msgid "Deleted State:" msgstr "Deleted State:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 msgid "Visible State:" msgstr "Visible State:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 msgid "Referenced by:" msgstr "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(none)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:390 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "deleted" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:392 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 msgid "not deleted" msgstr "not deleted" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 msgid "visible (on the server)" msgstr "visible (on the server)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:401 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 msgid "not visible (on the server)" msgstr "not visible (on the server)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 msgid "Keep a clone of the local version" msgstr "Keep a clone of the local version" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:410 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 msgid "Physically delete from local dataset" msgstr "Physically delete from local dataset" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:528 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "Keep my coordiates" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:543 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 msgid "Keep their coordiates" msgstr "Keep their coordiates" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:558 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 msgid "Undecide conflict between different coordinates" msgstr "Undecide conflict between different coordinates" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:573 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 msgid "Keep my deleted state" msgstr "Keep my deleted state" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 msgid "Keep their deleted state" msgstr "Keep their deleted state" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:603 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 msgid "Undecide conflict between deleted state" msgstr "Undecide conflict between deleted state" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 msgid "Keep my visible state" msgstr "Keep my visible state" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 msgid "Yes, reset the id" msgstr "Yes, reset the id" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:638 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 #, java-format msgid "" @@ -5068,17 +5068,17 @@ "yo agree?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:645 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 msgid "Reset id to 0" msgstr "Reset id to 0" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 msgid "Keep their visible state" msgstr "Keep their visible state" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:674 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 msgid "Yes, purge it" msgstr "Yes, purge it" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:679 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 #, java-format msgid "" @@ -5089,9 +5089,9 @@ "dataset.
Do you agree?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:684 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 msgid "Remove from dataset" msgstr "Remove from dataset" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 msgid "Undecide conflict between visible state" msgstr "Undecide conflict between visible state" @@ -5161,25 +5161,25 @@ msgstr "cannot apply undecided tag merge item" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:128 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:129 msgid "My version (local dataset)" msgstr "My version (local dataset)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:151 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:152 msgid "Their version (server dataset)" msgstr "Their version (server dataset)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:275 msgid "Keep the selected key/value pairs from the local dataset" msgstr "Keep the selected key/value pairs from the local dataset" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:304 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:305 msgid "Keep the selected key/value pairs from the server dataset" msgstr "Keep the selected key/value pairs from the server dataset" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:397 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:398 msgid "Undecide" msgstr "Undecide" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:400 msgid "Mark the selected tags as undecided" msgstr "Mark the selected tags as undecided" @@ -5222,5 +5222,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 msgid "Apply" msgstr "Apply" @@ -5545,18 +5545,18 @@ msgstr "Resolve conflicts." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 #, java-format msgid "Conflicts: {0} unresolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:325 msgid "Resolve" msgstr "Resolve" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326 msgid "Open a merge dialog of all selected items in the list above." msgstr "Open a merge dialogue of all selected items in the list above." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 @@ -5683,5 +5683,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 @@ -5778,5 +5778,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1365 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 msgid "Create a copy of this relation and open it in another editor window" msgstr "Create a copy of this relation and open it in another editor window" @@ -5830,5 +5830,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:353 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -7558,5 +7558,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7607,26 +7607,26 @@ msgstr "({0}/{1}): Downloading relation ''{2}''..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 msgid "Tags and Members" msgstr "Tags and Members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Parent Relations" msgstr "Parent Relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 msgid "Child Relations" msgstr "Child Relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:297 msgid "Apply Role:" msgstr "Apply Role:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299 msgid "Enter a role and apply it to the selected relation members" msgstr "Enter a role and apply it to the selected relation members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "" "There is at least one member in this relation referring
to the " @@ -7638,14 +7638,14 @@ "
How do you want to proceed with circular dependencies?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "Remove them, clean up relation" msgstr "Remove them, clean up relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 msgid "Ignore them, leave relation as is" msgstr "Ignore them, leave relation as is" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:605 #, java-format msgid "" @@ -7658,9 +7658,9 @@ "html>" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:615 msgid "Multiple members referring to same primitive" msgstr "Multiple members referring to same primitive" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633 #, java-format msgid "" @@ -7673,5 +7673,5 @@ "''{0}''." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:674 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -7679,5 +7679,5 @@ "Add all primitives selected in the current dataset before the first member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:700 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -7685,5 +7685,5 @@ "Add all primitives selected in the current dataset after the last member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:727 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7693,5 +7693,5 @@ "member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:761 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7701,15 +7701,15 @@ "member" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 msgid "Remove all members referring to one of the selected primitives" msgstr "Remove all members referring to one of the selected primitives" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:796 msgid "Relation Editor: Remove Selected" msgstr "Relation Editor: Remove Selected" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:830 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:842 msgid "" "Select relation members which refer to primitives in the current selection" @@ -7717,5 +7717,5 @@ "Select relation members which refer to primitives in the current selection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 #, java-format msgid "" @@ -7726,80 +7726,80 @@ "selection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:864 msgid "Select primitives for selected relation members" msgstr "Select primitives for selected relation members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 msgid "Sort the relation members" msgstr "Sort the relation members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:886 msgid "Sort" msgstr "Sort" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:887 msgid "Relation Editor: Sort" msgstr "Relation Editor: Sort" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Reverse the order of the relation members" msgstr "Reverse the order of the relation members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909 msgid "Reverse" msgstr "Reverse" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Reverse" msgstr "Relation Editor: Reverse" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 msgid "Move the currently selected members up" msgstr "Move the currently selected members up" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:933 msgid "Relation Editor: Move Up" msgstr "Relation Editor: Move Up" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 msgid "Move the currently selected members down" msgstr "Move the currently selected members down" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 msgid "Relation Editor: Move Down" msgstr "Relation Editor: Move Down" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 msgid "Remove the currently selected members from this relation" msgstr "Remove the currently selected members from this relation" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 msgid "Relation Editor: Remove" msgstr "Relation Editor: Remove" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 msgid "Delete the currently edited relation" msgstr "Delete the currently edited relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 msgid "Yes, create a conflict and close" msgstr "Yes, create a conflict and close" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1075 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 msgid "Click to create a conflict and close this relation editor" msgstr "Click to create a conflict and close this relation editor" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 msgid "No, continue editing" msgstr "No, continue editing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1081 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Click to return to the relation editor and to resume relation editing" msgstr "Click to return to the relation editor and to resume relation editing" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7811,5 +7811,5 @@ "conflict and close the editor?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1105 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 #, java-format msgid "" @@ -7820,47 +7820,47 @@ "
Please resolve this conflict first, then try again." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 msgid "Apply the current updates" msgstr "Apply the current updates" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 msgid "Apply the updates and close the dialog" msgstr "Apply the updates and close the dialog" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Cancel the updates and close the dialog" msgstr "Cancel the updates and close the dialog" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 msgid "Add an empty tag" msgstr "Add an empty tag" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 msgid "Download all incomplete members" msgstr "Download all incomplete members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 msgid "Download Members" msgstr "Download Members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 msgid "Relation Editor: Download Members" msgstr "Relation Editor: Download Members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 msgid "Download selected incomplete members" msgstr "Download selected incomplete members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 msgid "Sets a role for the selected members" msgstr "Sets a role for the selected members" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 msgid "Apply Role" msgstr "Apply Role" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7869,25 +7869,25 @@ msgstr[1] "You are setting an empty role on {0} primitives." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "This is equal to deleting the roles of these primitives." msgstr "This is equal to deleting the roles of these primitives." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 msgid "Do you really want to apply the new role?" msgstr "Do you really want to apply the new role?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1313 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 msgid "Yes, apply it" msgstr "Yes, apply it" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 msgid "No, do not apply" msgstr "No, do not apply" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 msgid "Confirm empty role" msgstr "Confirm empty role" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 msgid "Edit the relation the currently selected relation member refers to" msgstr "Edit the relation the currently selected relation member refers to" @@ -7932,13 +7932,13 @@ msgstr "including immediate children of parent relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92 msgid "Load parent relations" msgstr "Load parent relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 msgid "Loading parent relations" msgstr "Loading parent relations" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141 msgid "Edit the currently selected relation" msgstr "Edit the currently selected relation" @@ -14349,5 +14349,5 @@ "

The error message is:
{0}" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:348 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:353 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -16902,12 +16902,10 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:291 -#, fuzzy msgid "Abort tag editing and close dialog" -msgstr "Apply the updates and close the dialog" +msgstr "" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:304 -#, fuzzy msgid "Apply edited tags and close dialog" -msgstr "Apply the updates and close the dialog" +msgstr "" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 @@ -31159,7 +31157,4 @@ msgstr "Sicily - Italy" -#~ msgid "" -#~ msgstr "" - #~ msgid "Move" #~ msgstr "Move" @@ -32170,4 +32165,7 @@ #~ msgstr "Remove route nodes" +#~ msgid "" +#~ msgstr "" + #~ msgid "Login name (email) to the OSM account." #~ msgstr "Login name (e-mail) to the OSM account." Index: applications/editors/josm/i18n/po/es.po =================================================================== --- applications/editors/josm/i18n/po/es.po (revision 20093) +++ applications/editors/josm/i18n/po/es.po (revision 20140) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-21 09:35+0100\n" +"POT-Creation-Date: 2010-02-24 19:46+0100\n" "PO-Revision-Date: 2010-02-14 23:28+0000\n" "Last-Translator: bastik \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-02-21 08:13+0000\n" +"X-Launchpad-Export-Date: 2010-02-24 18:27+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -69,6 +69,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:291 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 @@ -251,5 +251,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -396,5 +396,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -700,5 +700,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:989 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -825,5 +825,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 msgid "Duplicate" msgstr "Duplicar" @@ -1688,6 +1688,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215 msgid "No, abort" @@ -2422,5 +2422,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:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149 @@ -3022,5 +3022,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1111 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 msgid "Double conflict" msgstr "Doble conflicto" @@ -3057,5 +3057,5 @@ #. should not happen #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 msgid "Cannot resolve undecided conflict." msgstr "no se puede resolver los conflictos pendientes" @@ -3232,10 +3232,10 @@ msgstr "Resolver conflicto de versión para la relación {0}" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:53 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "Resolver conflictos en la lista de nodos de la vía {0}" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:71 #, java-format msgid "Main dataset does not include node {0}" @@ -3546,27 +3546,27 @@ "no es un error crítico, puede continuar con su trabajo de manera segura." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:148 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 #, java-format msgid "Missing merge target for way with id {0}" msgstr "Falta de combinación de destino para la direccion con el ID {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:228 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 #, java-format msgid "Missing merge target for node with id {0}" msgstr "Falta de combinación de destino para el nodo con el ID {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Falta de combinación de destino para el objeto con el ID {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:243 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "Falta de combinación de destino para la relación con el ID {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:248 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3576,5 +3576,5 @@ #. 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:281 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 #, java-format msgid "" @@ -3719,6 +3719,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:291 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:313 +#: ../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}." @@ -3838,5 +3838,5 @@ #. darker blue #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:183 msgid "background" @@ -4082,5 +4082,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 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 msgid "Conflict" msgstr "Conflicto" @@ -4340,5 +4340,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:936 #: ../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/dialogs/relation/ReferringRelationsBrowser.java:143 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:209 @@ -4585,14 +4585,14 @@ msgstr "La función {0} no participa en la pareja de comparación {1}" -#: ../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/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Propiedades" -#: ../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/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:235 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:239 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:507 @@ -4601,6 +4601,6 @@ msgstr "Etiquetas" -#: ../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/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4608,16 +4608,16 @@ msgstr "Nodos" -#: ../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:271 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:275 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Miembros" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 msgid "No pending tag conflicts to be resolved" msgstr "Ningún conflito de etiqueta pendiente de ser resuelto" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "Tags({0} conflict)" @@ -4626,5 +4626,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4633,9 +4633,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "Nodes(resolved)" msgstr "Nodos (resueltos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4644,17 +4644,17 @@ "lista de nodos de esta vía" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Nodes(with conflicts)" msgstr "Nodos (con conflictos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 msgid "Pending conflicts in the node list of this way" msgstr "Conflictos pendientes en la lista de nodos de esta vía" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:194 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Members(resolved)" msgstr "Miembros (resueltos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4664,25 +4664,25 @@ "lista de miembros de esta relación" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Members(with conflicts)" msgstr "Miembros (con conflictos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending conflicts in the member list of this relation" msgstr "Conflictos pendientes en la lista de miembros de esta relación" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 msgid "No pending property conflicts" msgstr "Ningún conflicto de propiedades pendiente" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:211 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Properties(with conflicts)" msgstr "Propiedades (con conflictos)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 msgid "Pending property conflicts to be resolved" msgstr "Conflictos de propiedades pendientes de resolver" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:292 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 msgid "Conflict Resolution" msgstr "Resolución de conflictos" @@ -4728,5 +4728,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 msgid "My version" msgstr "Mi versión" @@ -4739,6 +4739,6 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" msgstr "Versión fusionada" @@ -4753,5 +4753,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 msgid "Their version" msgstr "Su versión" @@ -4941,5 +4941,5 @@ msgstr "Nodo" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 msgid "Merged nodes not frozen yet. Cannot build resolution command." msgstr "" @@ -4947,5 +4947,5 @@ "de resolución." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:460 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:463 #, java-format msgid "" @@ -4956,19 +4956,19 @@ "{0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 msgid "Communication with server failed" msgstr "Comunicación fallida con el servidor" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:540 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:509 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:543 msgid "Yes, undelete them too" msgstr "Sí, deshacer el borrado de ellos también" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:507 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:541 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 msgid "No, cancel operation" msgstr "No, calcelar la operación" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514 #, java-format msgid "" @@ -4981,9 +4981,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:524 msgid "Undelete additional nodes?" msgstr "¿Deshacer el borrado de los nodos adicionales?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:548 #, java-format msgid "" @@ -4996,14 +4996,14 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:555 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:558 msgid "Undelete dependent primitives?" msgstr "¿Deshacer borrado de primitivos dependientes?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" "Propiedade de mi conjunto de datos, es decir el conjunto de datos locales" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5013,5 +5013,5 @@ "elementos cuando se apliquen las decisiones de fusionar." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" @@ -5019,87 +5019,87 @@ "servidor" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 msgid "Coordinates:" msgstr "Coordenadas:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 msgid "Deleted State:" msgstr "Estado borrado:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 msgid "Visible State:" msgstr "Estado visible:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 msgid "Referenced by:" msgstr "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(ninguno)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:390 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 #: ../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:392 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 msgid "not deleted" msgstr "no borrado" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 msgid "visible (on the server)" msgstr "visible (en el servidor)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:401 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 msgid "not visible (on the server)" msgstr "no visible (en el servidor)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 msgid "Keep a clone of the local version" msgstr "Mantener un clon de la versión local" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:410 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 msgid "Physically delete from local dataset" msgstr "Eliminar físicamente del conjunto de datos locales" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:528 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "Mantener mis coordenadas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:543 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 msgid "Keep their coordiates" msgstr "Mantener sus coordenadas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:558 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 msgid "Undecide conflict between different coordinates" msgstr "Conflicto no resuelto entre las diferentes coordenadas" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:573 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 msgid "Keep my deleted state" msgstr "Mantener mi estado suprimido" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 msgid "Keep their deleted state" msgstr "Mantener su estado suprimido" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:603 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 msgid "Keep my visible state" msgstr "Mantener mi estado visible" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 msgid "Yes, reset the id" msgstr "Sí, reiniciar el id" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:638 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 #, java-format msgid "" @@ -5112,17 +5112,17 @@ "nueva ID.
¿Continuar? " -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:645 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 msgid "Reset id to 0" msgstr "Reiniciar el id a 0" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 msgid "Keep their visible state" msgstr "Mantener su estado visible" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:674 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 msgid "Yes, purge it" msgstr "Sí, purgarlo" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:679 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 #, java-format msgid "" @@ -5133,9 +5133,9 @@ "acuerdo?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:684 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 msgid "Remove from dataset" msgstr "Eliminar desde el conjunto de datos" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 msgid "Undecide conflict between visible state" msgstr "Conflicto entre estado visibles sin decidir" @@ -5208,18 +5208,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:128 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:129 msgid "My version (local dataset)" msgstr "Mi versión (conjunto de datos locales)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:151 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:152 msgid "Their version (server dataset)" msgstr "Su versión (conjunto de datos del servidor)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:275 msgid "Keep the selected key/value pairs from the local dataset" msgstr "" "Mantener la pareja clave/valor seleccionado del conjunto de datos locales" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:304 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:305 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" @@ -5227,9 +5227,9 @@ "servidor" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:397 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:398 msgid "Undecide" msgstr "Pendiente" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:400 msgid "Mark the selected tags as undecided" msgstr "Marcar la etiqueta seleccionada como pendiente" @@ -5272,5 +5272,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 msgid "Apply" msgstr "Aplicar" @@ -5592,14 +5592,14 @@ msgstr "Resolver conflictos." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 #, java-format msgid "Conflicts: {0} unresolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:325 msgid "Resolve" msgstr "Resolver" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5607,5 +5607,5 @@ "en la lista superior." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 @@ -5727,5 +5727,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 @@ -5823,5 +5823,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1365 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 msgid "Create a copy of this relation and open it in another editor window" msgstr "Crear una copia de esta relación y abrirla en otra ventana de edición." @@ -5875,5 +5875,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:353 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -7595,5 +7595,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7643,26 +7643,26 @@ msgstr "({0}/{1}): Descargando relación ''{2}''..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 msgid "Tags and Members" msgstr "Etiquetas y miembros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Parent Relations" msgstr "Relaciones padre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 msgid "Child Relations" msgstr "Relaciones hijo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:297 msgid "Apply Role:" msgstr "Aplicar función:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "" "There is at least one member in this relation referring
to the " @@ -7671,14 +7671,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "Remove them, clean up relation" msgstr "Eliminarlos, limpiar la relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 msgid "Ignore them, leave relation as is" msgstr "Ignorarlos, dejar la relación como está" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:605 #, java-format msgid "" @@ -7688,9 +7688,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:615 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633 #, java-format msgid "" @@ -7700,5 +7700,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:674 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -7707,5 +7707,5 @@ "del primer miembro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:700 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -7714,5 +7714,5 @@ "del último miembro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:727 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7722,5 +7722,5 @@ "del primer miembro seleccionado" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:761 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7730,15 +7730,15 @@ "del último miembro seleccionado" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:796 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:830 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:842 msgid "" "Select relation members which refer to primitives in the current selection" @@ -7747,5 +7747,5 @@ "la selección actual" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 #, java-format msgid "" @@ -7756,80 +7756,80 @@ "la selección actual" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:864 msgid "Select primitives for selected relation members" msgstr "Seleccionar primitivas para la relación de miembros señalada" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 msgid "Sort the relation members" msgstr "Ordenar los miembros de la relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:886 msgid "Sort" msgstr "Ordenar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:887 msgid "Relation Editor: Sort" msgstr "Editor de relaciones: Ordenar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Reverse the order of the relation members" msgstr "Invertir el orden de los miembros de la relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909 msgid "Reverse" msgstr "Invertir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Reverse" msgstr "Editor de relaciones: Invertir" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 msgid "Move the currently selected members up" msgstr "Mover los miembro(s) seleccionos hacia arriba" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:933 msgid "Relation Editor: Move Up" msgstr "Editor de relaciones: Mover arriba" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 msgid "Move the currently selected members down" msgstr "Mover los miembros seleccionados hacia abajo" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 msgid "Relation Editor: Move Down" msgstr "Editor de relaciones: Mover abajo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 msgid "Relation Editor: Remove" msgstr "Editor de relaciones: Borrar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 msgid "Delete the currently edited relation" msgstr "Eliminar esta relación" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 msgid "Yes, create a conflict and close" msgstr "Sí, crear un conflicto y cerrar" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1075 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 msgid "No, continue editing" msgstr "No, continuar editando" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1081 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7838,5 +7838,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1105 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 #, java-format msgid "" @@ -7847,47 +7847,47 @@ "necesario resolver el conflicto antes de continuar." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 msgid "Apply the current updates" msgstr "Aplicar las actualizaciones actuales" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 msgid "Apply the updates and close the dialog" msgstr "Aplicar las actualizaciones y cerrar el diálogo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Cancel the updates and close the dialog" msgstr "Cancelar las actualizaciones y cerrar el cuadro de diálogo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 msgid "Add an empty tag" msgstr "Añadir una etiqueta vacía" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 msgid "Download all incomplete members" msgstr "Descargar todos los miembros incompletos" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 msgid "Download Members" msgstr "Descargar miembros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +msgid "Relation Editor: Download Members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 -msgid "Relation Editor: Download Members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 msgid "Download selected incomplete members" msgstr "Descargar los miembros incompletos seleccionados" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 msgid "Sets a role for the selected members" msgstr "Fijar una función para los miembros seleccionados" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 msgid "Apply Role" msgstr "Aplicar función" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7896,25 +7896,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1313 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 msgid "Yes, apply it" msgstr "Sí, aplícalo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 msgid "No, do not apply" msgstr "No, no lo apliques" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 msgid "Confirm empty role" msgstr "Confirmar función vacía" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -7962,13 +7962,13 @@ msgstr "incluido los hijos inmediatos de las relaciones padre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92 msgid "Load parent relations" msgstr "Cargar relaciones padre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 msgid "Loading parent relations" msgstr "Cargando relaciones padre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141 msgid "Edit the currently selected relation" msgstr "Editar la relación seleccionada" @@ -14133,5 +14133,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:348 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:353 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -16681,12 +16681,10 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:291 -#, fuzzy msgid "Abort tag editing and close dialog" -msgstr "Aplicar las actualizaciones y cerrar el diálogo" +msgstr "" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:304 -#, fuzzy msgid "Apply edited tags and close dialog" -msgstr "Aplicar las actualizaciones y cerrar el diálogo" +msgstr "" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 @@ -30993,7 +30991,4 @@ msgstr "Sicilia - Italia" -#~ msgid "" -#~ msgstr "" - #~ msgid "Move" #~ msgstr "Mover" @@ -31955,4 +31950,7 @@ #~ msgstr "Carga directamente archivos TCX en JOSM" +#~ msgid "" +#~ msgstr "" + #~ msgid "" #~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or " Index: applications/editors/josm/i18n/po/et.po =================================================================== --- applications/editors/josm/i18n/po/et.po (revision 20093) +++ applications/editors/josm/i18n/po/et.po (revision 20140) @@ -8,6 +8,6 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-21 09:35+0100\n" -"PO-Revision-Date: 2010-02-18 00:40+0000\n" +"POT-Creation-Date: 2010-02-24 19:46+0100\n" +"PO-Revision-Date: 2010-02-21 10:44+0000\n" "Last-Translator: Margus Värton \n" "Language-Team: Estonian \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-02-21 08:09+0000\n" +"X-Launchpad-Export-Date: 2010-02-24 18:32+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -69,6 +69,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:291 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 @@ -244,5 +244,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -388,5 +388,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -690,5 +690,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:989 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -812,5 +812,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 msgid "Duplicate" msgstr "Kahekordista" @@ -1652,6 +1652,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215 msgid "No, abort" @@ -2363,5 +2363,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:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149 @@ -2912,5 +2912,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1111 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 msgid "Double conflict" msgstr "" @@ -2943,5 +2943,5 @@ #. should not happen #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 msgid "Cannot resolve undecided conflict." msgstr "" @@ -3112,10 +3112,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:53 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:71 #, java-format msgid "Main dataset does not include node {0}" @@ -3390,27 +3390,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:148 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:228 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:243 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:248 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3420,5 +3420,5 @@ #. 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:281 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 #, java-format msgid "" @@ -3563,6 +3563,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:291 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:313 +#: ../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}." @@ -3680,5 +3680,5 @@ #. darker blue #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:183 msgid "background" @@ -3920,5 +3920,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 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 msgid "Conflict" msgstr "Vastuolu" @@ -4170,5 +4170,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:936 #: ../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/dialogs/relation/ReferringRelationsBrowser.java:143 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:209 @@ -4403,14 +4403,14 @@ msgstr "" -#: ../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/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "" -#: ../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/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:235 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:239 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:507 @@ -4419,6 +4419,6 @@ msgstr "" -#: ../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/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4426,16 +4426,16 @@ msgstr "" -#: ../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:271 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:275 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Liikmed" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "Tags({0} conflict)" @@ -4444,5 +4444,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4451,26 +4451,26 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 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:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:194 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4478,25 +4478,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:211 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:292 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 msgid "Conflict Resolution" msgstr "" @@ -4542,5 +4542,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 msgid "My version" msgstr "" @@ -4551,6 +4551,6 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" msgstr "" @@ -4563,5 +4563,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 msgid "Their version" msgstr "" @@ -4730,9 +4730,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 msgid "Merged nodes not frozen yet. Cannot build resolution command." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:460 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:463 #, java-format msgid "" @@ -4741,19 +4741,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:540 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:509 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:543 msgid "Yes, undelete them too" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:507 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:541 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 msgid "No, cancel operation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514 #, java-format msgid "" @@ -4766,9 +4766,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:524 msgid "Undelete additional nodes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:548 #, java-format msgid "" @@ -4781,13 +4781,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:555 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:558 msgid "Undelete dependent primitives?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "" "Properties in the merged element. They will replace properties in my " @@ -4795,91 +4795,91 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 msgid "Coordinates:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 msgid "Referenced by:" msgstr "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:390 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:392 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 msgid "not deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 msgid "visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:401 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 msgid "not visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 msgid "Keep a clone of the local version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:410 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:528 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:543 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:558 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:573 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:603 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:638 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 #, java-format msgid "" @@ -4889,17 +4889,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:645 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 msgid "Reset id to 0" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 msgid "Keep their visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:674 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 msgid "Yes, purge it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:679 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 #, java-format msgid "" @@ -4908,9 +4908,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:684 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 msgid "Remove from dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 msgid "Undecide conflict between visible state" msgstr "" @@ -4980,25 +4980,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:128 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:129 msgid "My version (local dataset)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:151 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:152 msgid "Their version (server dataset)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:275 msgid "Keep the selected key/value pairs from the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:304 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:305 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:397 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:398 msgid "Undecide" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:400 msgid "Mark the selected tags as undecided" msgstr "" @@ -5041,5 +5041,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 msgid "Apply" msgstr "" @@ -5346,18 +5346,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 #, java-format msgid "Conflicts: {0} unresolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:325 msgid "Resolve" msgstr "Lahenda" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326 msgid "Open a merge dialog of all selected items in the list above." msgstr "Ava ülalolevast nimekirjast valitud kõigi objektide ühendamisdialoog." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 @@ -5479,5 +5479,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 @@ -5574,5 +5574,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1365 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5626,5 +5626,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:353 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -7311,5 +7311,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7358,26 +7358,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 msgid "Tags and Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Parent Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:297 msgid "Apply Role:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "" "There is at least one member in this relation referring
to the " @@ -7386,14 +7386,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:605 #, java-format msgid "" @@ -7403,9 +7403,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:615 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633 #, java-format msgid "" @@ -7415,15 +7415,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:674 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:700 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:727 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7431,5 +7431,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:761 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7437,20 +7437,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:796 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:830 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:842 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 #, java-format msgid "" @@ -7459,80 +7459,80 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:864 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:886 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:887 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Reverse the order of the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 msgid "Move the currently selected members up" msgstr "Liiguta hetkel valitud liiget ülespoole" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:933 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 msgid "Move the currently selected members down" msgstr "Liiguta hetkel valitud liiget allapoole" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1075 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1081 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7541,5 +7541,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1105 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 #, java-format msgid "" @@ -7548,47 +7548,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 msgid "Apply the current updates" msgstr "Rakenda jooksvad uuendused" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 msgid "Download Members" msgstr "Lae alla liikmed" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +msgid "Relation Editor: Download Members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 -msgid "Relation Editor: Download Members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7597,25 +7597,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1313 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -7660,13 +7660,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92 msgid "Load parent relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 msgid "Loading parent relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141 msgid "Edit the currently selected relation" msgstr "" @@ -13634,5 +13634,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:348 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:353 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." Index: applications/editors/josm/i18n/po/fi.po =================================================================== --- applications/editors/josm/i18n/po/fi.po (revision 20093) +++ applications/editors/josm/i18n/po/fi.po (revision 20140) @@ -8,7 +8,7 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-21 09:35+0100\n" -"PO-Revision-Date: 2010-02-18 00:14+0000\n" -"Last-Translator: Matti Kujala \n" +"POT-Creation-Date: 2010-02-24 19:46+0100\n" +"PO-Revision-Date: 2010-02-23 13:04+0000\n" +"Last-Translator: Teemu Koskinen \n" "Language-Team: Finnish \n" "MIME-Version: 1.0\n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-02-21 08:16+0000\n" +"X-Launchpad-Export-Date: 2010-02-24 18:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -69,6 +69,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:291 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 @@ -244,5 +244,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -390,5 +390,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -409,9 +409,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:274 msgid "Close the dialog and create a new node" -msgstr "Sulje ikkuna ja tee uusi solmu" +msgstr "Sulje ikkuna ja luo uusi piste" #: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:287 msgid "Close the dialog, do not create a new node" -msgstr "Sulje ikkuna tekemättä uutta solmua" +msgstr "Sulje ikkuna luomatta uutta pistettä" #: ../core/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:37 @@ -528,9 +528,9 @@ #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:37 msgid "previous" -msgstr "" +msgstr "edellinen" #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:38 msgid "next" -msgstr "" +msgstr "seuraava" #: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:53 @@ -691,5 +691,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:989 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -742,13 +742,13 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:37 msgid "Download object..." -msgstr "" +msgstr "Lataa objekti..." #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:37 msgid "Download OSM object by ID." -msgstr "" +msgstr "Lataa OSM-objekti ID:n perusteella." #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:38 msgid "Download Object..." -msgstr "" +msgstr "Lataa objekti..." #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:43 @@ -772,26 +772,26 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:55 msgid "Object type:" -msgstr "" +msgstr "Objektin tyyppi:" #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:62 msgid "Object ID:" -msgstr "" +msgstr "Objektin ID:" #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:64 msgid "Enter the ID of the object that should be downloaded" -msgstr "" +msgstr "Anna ladattavan objektin ID" #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:77 msgid "Download Object" -msgstr "" +msgstr "Lataa objekti" #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:78 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadPrimitiveTask.java:43 msgid "Download object" -msgstr "" +msgstr "Lataa objekti" #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:83 msgid "Start downloading" -msgstr "" +msgstr "Aloita lataus" #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:84 @@ -813,5 +813,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 msgid "Duplicate" msgstr "Monista" @@ -823,9 +823,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20 msgid "Duplicate Layer" -msgstr "" +msgstr "Monista taso" #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:20 msgid "Make a duplicate of the currently selected layer." -msgstr "" +msgstr "Tee kopio valitusta tasosta." #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 @@ -937,15 +937,15 @@ msgid_plural "" "The selected ways have nodes outside of the downloaded data region." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Valitussa polussa on pisteitä ladatun alueen ulkopuolella." +msgstr[1] "Valituissa poluissa on pisteitä ladatun alueen ulkopuolella." #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:155 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:85 msgid "This can lead to nodes being deleted accidentally." -msgstr "" +msgstr "Tämä voi johtaa pisteiden poistamiseen vahingossa." #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:156 msgid "Are you really sure to continue?" -msgstr "" +msgstr "Haluatko varmasti jatkaa?" #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:157 @@ -971,9 +971,9 @@ #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:230 msgid "Joined self-overlapping area" -msgstr "" +msgstr "Yhdistettiin itsensä kanssa päälekkäinen alue" #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:231 msgid "Joined overlapping areas" -msgstr "" +msgstr "Yhdistä osittain päälekkäiset alueet" #: ../core/src/org/openstreetmap/josm/actions/JoinAreasAction.java:235 @@ -1046,5 +1046,5 @@ #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:59 msgid "You can also paste an URL from www.openstreetmap.org" -msgstr "" +msgstr "Voit myös liittää URL:n www.openstreetmap.org:sta" #: ../core/src/org/openstreetmap/josm/actions/JumpToAction.java:91 @@ -1075,9 +1075,9 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 msgid "Merge layer" -msgstr "Liitä taso" +msgstr "Yhdistä taso" #: ../core/src/org/openstreetmap/josm/actions/MergeLayerAction.java:19 msgid "Merge the current layer into another layer" -msgstr "Liitä nykyinen taso toiseen tasoon" +msgstr "Yhdistä nykyinen taso toiseen tasoon" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:47 @@ -1096,9 +1096,9 @@ #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:127 msgid "Abort Merging" -msgstr "Peru sulautus" +msgstr "Peruuta pisteiden yhdistäminen" #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:129 msgid "Click to abort merging nodes" -msgstr "Voit keskeytettää solmujen yhteensulautuksen napsauttamalla tästä" +msgstr "Napsauta keskeyttääksesi pisteiden yhdistämisen." #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:136 @@ -1107,6 +1107,6 @@ "Cannot merge nodes: Would have to delete way ''{0}'' which is still used." msgstr "" -"Solmuja ei voi sulauttaa yhteen: Polku ''{0}'' pitäisi poistaa, mutta se on " -"vielä käytössä." +"Pisteitä ei voi yhdistää: Polku \"{0}\" pitäisi poistaa, mutta se on vielä " +"käytössä." #: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:229 @@ -1136,5 +1136,5 @@ #: ../core/src/org/openstreetmap/josm/actions/MirrorAction.java:55 msgid "Please select at least one node or way." -msgstr "Valitse ainakin yksi solmu tai tie" +msgstr "Valitse ainakin yksi piste tai polku." #: ../core/src/org/openstreetmap/josm/actions/MoveAction.java:37 @@ -1234,6 +1234,6 @@ msgid "Opening {0} file..." msgid_plural "Opening {0} files..." -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Avataan {0} tiedosto..." +msgstr[1] "Avataan {0} tiedostoa..." #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:262 @@ -1650,29 +1650,29 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:65 msgid "Yes, delete nodes" -msgstr "" +msgstr "Kyllä, poista pisteet" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:67 msgid "Delete nodes outside of downloaded data regions" -msgstr "" +msgstr "Poista pisteet ladatun alueen ulkopuolelta" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215 msgid "No, abort" -msgstr "" +msgstr "Ei, peruuta" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:73 #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:119 msgid "Cancel operation" -msgstr "" +msgstr "Peruuta toiminto" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:86 msgid "Do you want to delete them anyway?" -msgstr "" +msgstr "Haluatko poistaa ne silti?" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:88 msgid "Delete nodes outside of data regions?" -msgstr "" +msgstr "Poista pisteitä ladatun alueen ulkopuolelta?" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:101 @@ -1684,9 +1684,9 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayerInfoCellRenderer.java:57 msgid "Yes" -msgstr "" +msgstr "Kyllä" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:113 msgid "Simplify all selected ways" -msgstr "" +msgstr "Yksinkertaista kaikki valitut polut" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:126 @@ -1694,9 +1694,9 @@ msgid "" "The selection contains {0} ways. Are you sure you want to simplify them all?" -msgstr "" +msgstr "Valinnassa on {0} polkua. Haluatko varmasti yksinkertaistaa ne kaikki?" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:129 msgid "Simplify ways?" -msgstr "" +msgstr "Yksinkertaista polut?" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:180 @@ -1704,6 +1704,6 @@ msgid "Simplify {0} way" msgid_plural "Simplify {0} ways" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Yksinkertaista {0} polku" +msgstr[1] "Yksinkertaista {0} polkua" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:251 @@ -1886,6 +1886,6 @@ msgid "Dupe {0} node into {1} nodes" msgid_plural "Dupe {0} nodes into {1} nodes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Monista {0} piste {1} pisteeksi" +msgstr[1] "Monista {0} pistettä {1} pisteeksi" #: ../core/src/org/openstreetmap/josm/actions/UndoAction.java:24 @@ -1924,5 +1924,5 @@ #: ../core/src/org/openstreetmap/josm/actions/UpdateDataAction.java:25 msgid "Updates the objects in the active data layer from the server." -msgstr "" +msgstr "Päivittää aktiivisen datatason objektit palvelimelta." #. bounds defined? => use the bbox downloader @@ -1931,15 +1931,15 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:973 msgid "Download data" -msgstr "" +msgstr "Lataa dataa" #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:23 #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:27 msgid "Update modified" -msgstr "" +msgstr "Päivitä muokatut objektit" #: ../core/src/org/openstreetmap/josm/actions/UpdateModifiedAction.java:25 msgid "" "Updates the currently modified objects from the server (re-downloads data)" -msgstr "" +msgstr "Päivittää muokatut objektit palvelimelta" #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:74 @@ -2224,5 +2224,5 @@ #, java-format msgid "({0}/{1}) Loading parents of node {2}" -msgstr "({0}/{1}) Ladataan solmun {2} emoelementit" +msgstr "({0}/{1}) Ladataan pisteeseen {2} viittaavat objektit" #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadReferrersTask.java:224 @@ -2378,5 +2378,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:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149 @@ -2885,6 +2885,6 @@ msgid "Added {0} object" msgid_plural "Added {0} objects" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "Lisättiin {0} objekti" +msgstr[1] "Lisättiin {0} objektia" #: ../core/src/org/openstreetmap/josm/command/ChangeCommand.java:49 @@ -2956,5 +2956,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1111 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 msgid "Double conflict" msgstr "" @@ -2987,5 +2987,5 @@ #. should not happen #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 msgid "Cannot resolve undecided conflict." msgstr "" @@ -2999,15 +2999,15 @@ #, java-format msgid "Delete node {0}" -msgstr "" +msgstr "Poista piste {0}" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:162 #, java-format msgid "Delete way {0}" -msgstr "" +msgstr "Poista polku {0}" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:163 #, java-format msgid "Delete relation {0}" -msgstr "" +msgstr "Poista relaatio {0}" #: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:177 @@ -3159,10 +3159,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:53 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:71 #, java-format msgid "Main dataset does not include node {0}" @@ -3439,27 +3439,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:148 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:228 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:243 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:248 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3469,5 +3469,5 @@ #. 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:281 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 #, java-format msgid "" @@ -3612,6 +3612,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:291 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:313 +#: ../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}." @@ -3731,5 +3731,5 @@ #. darker blue #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:183 msgid "background" @@ -3950,9 +3950,9 @@ #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:121 msgid "Network exception" -msgstr "" +msgstr "Verkkovirhe" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:139 msgid "IO Exception" -msgstr "" +msgstr "IO-virhe" #: ../core/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java:172 @@ -3971,5 +3971,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 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 msgid "Conflict" msgstr "Ristiriita" @@ -4012,5 +4012,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:82 msgid "Click to close the dialog" -msgstr "" +msgstr "Napsauta sulkeaksesi ikkunan" #: ../core/src/org/openstreetmap/josm/gui/JosmUserIdentityManager.java:104 @@ -4138,5 +4138,5 @@ #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:85 msgid "Set the language" -msgstr "" +msgstr "Aseta kieli" #: ../core/src/org/openstreetmap/josm/gui/MainApplication.java:86 @@ -4205,5 +4205,5 @@ #, java-format msgid "Preference setting {0} has been removed since it is no longer used." -msgstr "" +msgstr "Asetus {0} on poistettu koska sitä ei enää tarvita." #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:166 @@ -4215,5 +4215,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:936 #: ../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/dialogs/relation/ReferringRelationsBrowser.java:143 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:209 @@ -4337,9 +4337,9 @@ #, java-format msgid "Layer ''{0}'' must be in list of layers" -msgstr "" +msgstr "Tason \"{0}\" tulee olla tasolistassa" #: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:50 msgid "Click to cancel the current operation" -msgstr "" +msgstr "Napsauta keskeyttääksesi menossa oleva toiminto" #: ../core/src/org/openstreetmap/josm/gui/QuadStateCheckBox.java:86 @@ -4448,14 +4448,14 @@ msgstr "" -#: ../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/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "" -#: ../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/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:235 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:239 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:507 @@ -4464,6 +4464,6 @@ msgstr "Tagit" -#: ../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/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4471,23 +4471,23 @@ msgstr "Pisteet" -#: ../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:271 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:275 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Jäsenet" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "Tags({0} conflict)" msgid_plural "Tags({0} conflicts)" -msgstr[0] "" -msgstr[1] "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +msgstr[0] "Tagit ({0} ristiriita)" +msgstr[1] "Tagit ({0} ristiriitaa)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4496,26 +4496,26 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 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:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Nodes(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +msgstr "Pisteet (ristiriitoja)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:194 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4523,25 +4523,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Members(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 +msgstr "Jäsenet (ristiriitoja)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:211 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Properties(with conflicts)" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 +msgstr "Ominaisuudet (ristiriitoja)" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:292 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 msgid "Conflict Resolution" msgstr "" @@ -4580,14 +4580,14 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:237 msgid "lock scrolling" -msgstr "" +msgstr "lukitse vieritys" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:245 msgid "Compare " -msgstr "" +msgstr "Vertaa " #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 msgid "My version" -msgstr "" +msgstr "Minun versioni" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:281 @@ -4596,8 +4596,8 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" -msgstr "" +msgstr "Yhdistetty versio" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:287 @@ -4608,7 +4608,7 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 msgid "Their version" -msgstr "" +msgstr "Palvelimen versio" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:293 @@ -4676,18 +4676,18 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:109 msgid "Up" -msgstr "" +msgstr "Ylös" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:698 msgid "Move up the selected elements by one position." -msgstr "" +msgstr "Siirrä valittuja elementtejä yksi rivi ylöspäin" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:728 #: ../core/src/org/openstreetmap/josm/gui/dialogs/FilterDialog.java:120 msgid "Down" -msgstr "" +msgstr "Alas" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:730 msgid "Move down the selected entries by one position." -msgstr "" +msgstr "Siirrä valittuja elementtejä yksi rivi alaspäin" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:760 @@ -4775,9 +4775,9 @@ msgstr "Piste" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 msgid "Merged nodes not frozen yet. Cannot build resolution command." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:460 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:463 #, java-format msgid "" @@ -4786,19 +4786,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:540 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:509 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:543 msgid "Yes, undelete them too" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:507 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:541 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 msgid "No, cancel operation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514 #, java-format msgid "" @@ -4811,9 +4811,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:524 msgid "Undelete additional nodes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:548 #, java-format msgid "" @@ -4826,13 +4826,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:555 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:558 msgid "Undelete dependent primitives?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "" "Properties in the merged element. They will replace properties in my " @@ -4840,91 +4840,91 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 msgid "Coordinates:" msgstr "Koordinaatit:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 msgid "Referenced by:" msgstr "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:390 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "poistettu" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:392 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 msgid "not deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 msgid "visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:401 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 msgid "not visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 msgid "Keep a clone of the local version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:410 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:528 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:543 +msgstr "Käytä minun koordinaatteja" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 msgid "Keep their coordiates" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:558 +msgstr "Käytä palvelimen koordinaatteja" + +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:573 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:603 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:638 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 #, java-format msgid "" @@ -4934,17 +4934,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:645 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 msgid "Reset id to 0" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 msgid "Keep their visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:674 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 msgid "Yes, purge it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:679 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 #, java-format msgid "" @@ -4953,9 +4953,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:684 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 msgid "Remove from dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 msgid "Undecide conflict between visible state" msgstr "" @@ -5025,25 +5025,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:128 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:129 msgid "My version (local dataset)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:151 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:152 msgid "Their version (server dataset)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:275 msgid "Keep the selected key/value pairs from the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:304 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:305 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:397 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:398 msgid "Undecide" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:400 msgid "Mark the selected tags as undecided" msgstr "" @@ -5086,5 +5086,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 msgid "Apply" msgstr "" @@ -5392,18 +5392,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 #, java-format msgid "Conflicts: {0} unresolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:325 msgid "Resolve" msgstr "Selvitä" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326 msgid "Open a merge dialog of all selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 @@ -5524,5 +5524,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 @@ -5537,9 +5537,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:322 msgid "Show" -msgstr "" +msgstr "Näytä" #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:323 msgid "Display the history of the selected objects." -msgstr "" +msgstr "Näytä valittujen objektien historia" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:155 @@ -5554,5 +5554,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:275 msgid "Delete the selected layers." -msgstr "" +msgstr "Poista valitut tasot." #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:336 @@ -5567,17 +5567,17 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:490 msgid "Activate" -msgstr "" +msgstr "Aktivoi" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:388 msgid "Activate the selected layer" -msgstr "" +msgstr "Aktivoi valittu taso" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:452 msgid "Merge this layer into another layer" -msgstr "" +msgstr "Yhdistä tämä taso toiseen tasoon" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:504 msgid "Duplicate this layer" -msgstr "" +msgstr "Monista tämä taso" #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:603 @@ -5591,5 +5591,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:33 msgid "Information about layer" -msgstr "" +msgstr "Tietoja tasosta" #. item "Land use/Quarry" text "Name" @@ -5619,7 +5619,7 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1365 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 msgid "Create a copy of this relation and open it in another editor window" -msgstr "" +msgstr "Luo kopio tästä relaatiosta ja avaa se toiseen ikkunaan" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:427 @@ -5633,13 +5633,13 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:456 msgid "Select members" -msgstr "" +msgstr "Valitse jäsenet" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:486 msgid "Download all members of the selected relations" -msgstr "" +msgstr "Lataa kaikki valittujen relaatioiden jäsenet" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:487 msgid "Download members" -msgstr "" +msgstr "Lataa jäsenet" #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:702 @@ -5671,5 +5671,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:353 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -5719,5 +5719,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:181 msgid "Launches a browser with information about the user" -msgstr "" +msgstr "Avaa käyttäjän tiedot www-selaimessa" #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:193 @@ -5769,5 +5769,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:131 msgid "Close the dialog" -msgstr "" +msgstr "Sulje ikkuna" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:356 @@ -6922,5 +6922,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:47 msgid "Enter a changeset id" -msgstr "" +msgstr "Syötä muutoskokoelman id" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:79 @@ -6972,9 +6972,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:389 msgid "User ID:" -msgstr "" +msgstr "Käyttäjän ID:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:409 msgid "User name:" -msgstr "" +msgstr "Käyttäjänimi:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:445 @@ -7012,5 +7012,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:554 msgid "Invalid user ID" -msgstr "" +msgstr "Virheellinen käyttäjän ID" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:563 @@ -7033,5 +7033,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:720 msgid "Date:" -msgstr "" +msgstr "Päivämäärä:" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:714 @@ -7146,5 +7146,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:128 msgid "Advanced" -msgstr "" +msgstr "Lisäasetukset" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:58 @@ -7187,5 +7187,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:42 msgid "URL: " -msgstr "" +msgstr "URL: " #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/UrlBasedQueryPanel.java:70 @@ -7317,5 +7317,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:973 msgid "Select relation" -msgstr "" +msgstr "Valitse relaatio" #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:974 @@ -7345,5 +7345,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:242 msgid "Download selected relations" -msgstr "" +msgstr "Lataa valitut relaatiot" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:246 @@ -7356,9 +7356,9 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationMemberTask.java:47 msgid "Download relation members" -msgstr "" +msgstr "Lataa relaation jäsenet" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7400,33 +7400,33 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:45 msgid "Download relations" -msgstr "" +msgstr "Lataa relaatiot" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/DownloadRelationTask.java:79 #, java-format msgid "({0}/{1}): Downloading relation ''{2}''..." -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 +msgstr "({0}/{1}): Ladataan relaatio ''{2}''..." + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 msgid "Tags and Members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +msgstr "Tagit ja jäsenet" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Parent Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:297 msgid "Apply Role:" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:295 +msgstr "Aseta rooli:" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299 msgid "Enter a role and apply it to the selected relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +msgstr "Syötä rooli ja aseta se valituille jäsenille" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "" "There is at least one member in this relation referring
to the " @@ -7435,14 +7435,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:605 #, java-format msgid "" @@ -7452,9 +7452,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:615 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633 #, java-format msgid "" @@ -7464,15 +7464,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:674 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:700 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:727 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7480,5 +7480,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:761 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7486,20 +7486,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:796 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:830 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:842 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 #, java-format msgid "" @@ -7508,80 +7508,80 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:864 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 msgid "Sort the relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +msgstr "Järjestä relaation jäsenet" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:886 msgid "Sort" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +msgstr "Järjestä" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:887 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Reverse the order of the relation members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +msgstr "Käännä jäsenten järjestys ympäri" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909 msgid "Reverse" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +msgstr "Käännä järjestys" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 msgid "Move the currently selected members up" msgstr "Siirrä valittuja jäseniä ylöspäin" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:933 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 msgid "Move the currently selected members down" msgstr "Siirrä valittuja jäseniä alaspäin" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 msgid "Remove the currently selected members from this relation" -msgstr "" +msgstr "Poista valitut jäsenet tästä relaatiosta" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1075 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1081 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7590,5 +7590,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1105 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 #, java-format msgid "" @@ -7597,47 +7597,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 msgid "Apply the current updates" msgstr "Tee muutokset" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 msgid "Apply the updates and close the dialog" msgstr "Tee muutokset ja sulje tämä ikkuna" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Cancel the updates and close the dialog" msgstr "Peruuta muutokset ja sulje tämä ikkuna" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 msgid "Download all incomplete members" msgstr "Lataa kaikki keskeneräiset jäsenet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 msgid "Download Members" msgstr "Lataa jäsenet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +msgid "Relation Editor: Download Members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 -msgid "Relation Editor: Download Members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 msgid "Download selected incomplete members" msgstr "Lataa valitut keskeneräiset jäsenet" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 msgid "Sets a role for the selected members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 +msgstr "Aseta rooli valituille jäsenille" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 msgid "Apply Role" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1306 +msgstr "Aseta rooli" + +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7646,25 +7646,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1313 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -7709,15 +7709,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92 msgid "Load parent relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 msgid "Loading parent relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141 msgid "Edit the currently selected relation" -msgstr "" +msgstr "Muokkaa valittua relaatiota" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 @@ -7728,5 +7728,5 @@ #, java-format msgid "Create new relation in layer ''{0}''" -msgstr "" +msgstr "Luo uusi relaatio tasolle \"{0}\"" #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:135 @@ -7782,9 +7782,9 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:183 msgid "Create bookmark" -msgstr "" +msgstr "Luo kirjanmerkki" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:185 msgid "Add a bookmark for the currently selected download area" -msgstr "" +msgstr "Luo kirjanmerkki valitusta latausalueesta" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:192 @@ -7796,5 +7796,5 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:253 msgid "Please enter a name for the bookmarked download area." -msgstr "" +msgstr "Syötä nimi kirjanmerkille" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:202 @@ -7805,9 +7805,9 @@ #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:217 msgid "Remove the currently selected bookmarks" -msgstr "" +msgstr "Poista valitut kirjanmerkit" #: ../core/src/org/openstreetmap/josm/gui/download/BookmarkSelection.java:242 msgid "Rename the currently selected bookmark" -msgstr "" +msgstr "Nimeä valitut kirjanmerkit uudelleen" #: ../core/src/org/openstreetmap/josm/gui/download/BoundingBoxSelection.java:104 @@ -8173,24 +8173,24 @@ #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:136 msgid "Coordinates" -msgstr "" +msgstr "Koordinaatit" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:48 #, java-format msgid "History for node {0}" -msgstr "" +msgstr "Pisteen {0} historia" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:49 #, java-format msgid "History for way {0}" -msgstr "" +msgstr "Polun {0} historia" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:50 #, java-format msgid "History for relation {0}" -msgstr "" +msgstr "Relaation {0} historia" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:149 msgid "Reload the history from the server" -msgstr "" +msgstr "Päivitä historia palvelimelta" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserModel.java:272 @@ -8230,15 +8230,15 @@ #, java-format msgid "Loading history for node {0}" -msgstr "" +msgstr "Ladataan pisteen {0} historiatietoja" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:187 #, java-format msgid "Loading history for way {0}" -msgstr "" +msgstr "Ladataan polun {0} historiatietoja" #: ../core/src/org/openstreetmap/josm/gui/history/HistoryLoadTask.java:188 #, java-format msgid "Loading history for relation {0}" -msgstr "" +msgstr "Ladataan relaation {0} historiatietoja" #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableCellRenderer.java:44 @@ -8246,5 +8246,5 @@ #, java-format msgid "Node {0}" -msgstr "" +msgstr "Piste {0}" #: ../core/src/org/openstreetmap/josm/gui/history/NodeListViewer.java:195 @@ -8263,10 +8263,10 @@ #, java-format msgid "Way {0}" -msgstr "" +msgstr "Polku {0}" #: ../core/src/org/openstreetmap/josm/gui/history/RelationMemberListTableCellRenderer.java:79 #, java-format msgid "Relation {0}" -msgstr "" +msgstr "Relaatio {0}" #: ../core/src/org/openstreetmap/josm/gui/history/TagTableCellRenderer.java:36 @@ -8330,5 +8330,5 @@ #: ../core/src/org/openstreetmap/josm/gui/history/VersionTableColumnModel.java:20 msgid "Version" -msgstr "" +msgstr "Versio" #: ../core/src/org/openstreetmap/josm/gui/io/AbstractUploadTask.java:62 @@ -10267,10 +10267,10 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:40 msgid "Username: " -msgstr "" +msgstr "Käyttäjänimi: " #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:127 #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java:54 msgid "Password: " -msgstr "" +msgstr "Salasana: " #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:175 @@ -13745,5 +13745,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:348 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:353 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -15290,5 +15290,5 @@ "lines). Default 50000." msgstr "" -"Generoitavien pisteiden enimmäismäärä ennen keskeyttämistä (ennen " +"Luotavien pisteiden enimmäismäärä ennen keskeyttämistä (ennen " "yksinkertaistusta). Oletusarvo 50000" @@ -16219,12 +16219,10 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:291 -#, fuzzy msgid "Abort tag editing and close dialog" -msgstr "Tee muutokset ja sulje tämä ikkuna" +msgstr "" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:304 -#, fuzzy msgid "Apply edited tags and close dialog" -msgstr "Tee muutokset ja sulje tämä ikkuna" +msgstr "" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 @@ -16688,5 +16686,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:23 msgid "Checks for ways with identical consecutive nodes." -msgstr "Etsii polkuja, joissa sama solmu toistuu useasti peräkkäin" +msgstr "Etsii polkuja, joissa sama piste toistuu useasti peräkkäin" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/DuplicatedWayNodes.java:36 @@ -16750,10 +16748,10 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:62 msgid "Nodes with same name" -msgstr "Samannimiset solmut" +msgstr "Samannimiset pisteet" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/NodesWithSameName.java:25 msgid "This test finds nodes that have the same name (might be duplicates)." msgstr "" -"Etsii solmut joilla keskenään sama nimi (mahdollisesti turhia " +"Etsii pisteet joilla keskenään sama nimi (mahdollisesti turhia " "kaksoiskappaleita)" @@ -16970,5 +16968,5 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:733 msgid "Looks for nodes or ways with FIXME in any property value." -msgstr "Etsii solmut ja polut joissa arvona FIXME" +msgstr "Etsii pisteet ja polut joilla on FIXME-tagi" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/TagChecker.java:740 @@ -17156,17 +17154,17 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:61 msgid "This test checks if a way has an endpoint very near to another way." -msgstr "Etsii polut joiden päätesolmu on hyvin lähellä jotain muuta polkua." +msgstr "Etsii polut joiden päätepiste on hyvin lähellä jotain muuta polkua." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:126 msgid "Way end node near other highway" -msgstr "Polun päätesolmu lähellä tietä" +msgstr "Polun päätepiste lähellä tietä" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:146 msgid "Way end node near other way" -msgstr "Polun päätesolmu lähellä toista polkua" +msgstr "Polun päätepiste lähellä toista polkua" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:167 msgid "Way node near other way" -msgstr "Polun solmu lähellä toista polkua" +msgstr "Polun piste lähellä toista polkua" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UnconnectedWays.java:185 @@ -17177,11 +17175,9 @@ #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:92 msgid "Untagged and unconnected nodes" -msgstr "Tagittomia irrallisia solmuja" +msgstr "Tagittomia irrallisia pisteitä" #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedNode.java:38 msgid "This test checks for untagged nodes that are not part of any way." -msgstr "" -"Etsii solmuja joilla ei ole ominaisuuksia ja jotka eivät ole osa mitään " -"polkua." +msgstr "Etsii tagittomia pisteitä jotka eivät ole osa mitään polkua." #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/tests/UntaggedWay.java:59 @@ -30186,10 +30182,10 @@ #: build/trans_validator.java:40 msgid "oneway tag on a node" -msgstr "avain \"oneway\" solmulla" +msgstr "avain \"oneway\" pisteellä" #. node : W : oneway == * #: build/trans_validator.java:41 msgid "bridge tag on a node" -msgstr "avain \"bridge\" solmulla" +msgstr "avain \"bridge\" pisteellä" #. node : W : bridge == BOOLEAN_TRUE Index: applications/editors/josm/i18n/po/fr.po =================================================================== --- applications/editors/josm/i18n/po/fr.po (revision 20093) +++ applications/editors/josm/i18n/po/fr.po (revision 20140) @@ -6,6 +6,6 @@ "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-21 09:35+0100\n" -"PO-Revision-Date: 2010-02-20 10:02+0000\n" +"POT-Creation-Date: 2010-02-24 19:46+0100\n" +"PO-Revision-Date: 2010-02-23 16:47+0000\n" "Last-Translator: Tbj \n" "Language-Team: Fr <>\n" @@ -14,5 +14,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Launchpad-Export-Date: 2010-02-21 08:16+0000\n" +"X-Launchpad-Export-Date: 2010-02-24 18:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" "X-Poedit-Language: French\n" @@ -68,6 +68,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:291 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 @@ -251,5 +251,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -398,5 +398,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -703,5 +703,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:989 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -777,9 +777,9 @@ #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:46 msgid "Download referrers" -msgstr "" +msgstr "Télécharger les référants" #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:47 msgid "Select if the referrers of the object should be downloaded as well" -msgstr "" +msgstr "Choisir si les référants de l'objet doivent être également téléchargés" #: ../core/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java:55 @@ -828,5 +828,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 msgid "Duplicate" msgstr "Dupliquer" @@ -1231,5 +1231,7 @@ msgid_plural "Cannot open {0} files with the file importer ''{1}''." msgstr[0] "" +"Impossible d'ouvrir {0} fichier avec l'importateur de fichier \"{1}\"." msgstr[1] "" +"Impossible d'ouvrir {0} fichiers avec l'importateur de fichier \"{1}\"." #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:132 @@ -1239,5 +1241,9 @@ "Cannot open {0} files because no suitable file importer is available." msgstr[0] "" +"Impossible d'ouvrir le fichier {0} car aucun importateur de fichiers adéquat " +"n'est disponible." msgstr[1] "" +"Impossible d'ouvrir les fichier {0} car aucun importateur de fichiers " +"adéquat n'est disponible." #: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:189 @@ -1387,4 +1393,6 @@ "orthogonalize them one by one." msgstr "" +"Veuillez vous assurer que les voies sélectionnées pointent dans une " +"direction similaire
ou orthogonaliser les un par un.<:html>" #: ../core/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java:417 @@ -1697,9 +1705,9 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:67 msgid "Delete nodes outside of downloaded data regions" -msgstr "" +msgstr "Supprimer les noeuds situés hors des zones de données téléchargées" #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215 msgid "No, abort" @@ -2035,4 +2043,7 @@ "''{0}''.
You have to resolve them first." msgstr "" +"Les données devant être téléchargées vers le serveur OSM, participent " +"à des conflits non résolus de la couche ''{0}''.
Vous devez d'abord les " +"résoudre." #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:153 @@ -2445,5 +2456,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:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149 @@ -2715,6 +2726,6 @@ "12T14:51:09Z, 2009-11-12 or T14:51 ...)" msgstr "" -"tampon horodateur:... - objets possédant ce tampon horodateur " -"(2009-11-12T14:51:09Z, 2009-11-12 or T14:51 ...)" +"timestamp:... - objets possédant ce tampon horodateur (2009-11-" +"12T14:51:09Z, 2009-11-12 or T14:51 ...)" #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:136 @@ -2884,13 +2895,13 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:653 msgid "Primitive id expected" -msgstr "" +msgstr "Identifiant de primitive attendu" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:661 msgid "Changeset id expected" -msgstr "" +msgstr "Identifiant de groupe de modifications attendu" #: ../core/src/org/openstreetmap/josm/actions/search/SearchCompiler.java:663 msgid "Version expected" -msgstr "" +msgstr "Version attendue" #: ../core/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java:58 @@ -3041,5 +3052,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1111 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 msgid "Double conflict" msgstr "Double conflit" @@ -3074,5 +3085,5 @@ #. should not happen #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 msgid "Cannot resolve undecided conflict." msgstr "impossible de résoudre un conflit non arbitré" @@ -3250,10 +3261,10 @@ msgstr "Résoudre le conflit de version pour la relation {0}" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:53 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "Résoudre les conflits de la liste des nœuds du chemin {0}" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:71 #, java-format msgid "Main dataset does not include node {0}" @@ -3540,27 +3551,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:148 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:228 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:243 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:248 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3570,5 +3581,5 @@ #. 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:281 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 #, java-format msgid "" @@ -3715,6 +3726,6 @@ "qu'il y a des clés avec des valeurs multiples." -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:291 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:313 +#: ../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}." @@ -3835,5 +3846,5 @@ #. darker blue #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:183 msgid "background" @@ -4075,5 +4086,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 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 msgid "Conflict" msgstr "Conflit" @@ -4122,4 +4133,5 @@ msgid "Expected non-empty value for parameter ''{0}'', got ''{1}''" msgstr "" +"Une valeur non vide était attendue pour le paramètre \"{0}\", ai reçu ''{1}''" #: ../core/src/org/openstreetmap/josm/gui/MainApplet.java:37 @@ -4334,5 +4346,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:936 #: ../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/dialogs/relation/ReferringRelationsBrowser.java:143 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:209 @@ -4579,14 +4591,14 @@ msgstr "le rôle {0} ne fait pas partie de la comparaison des paires {1}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:103 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:207 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Propriétés" -#: ../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/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:235 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:239 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:507 @@ -4595,6 +4607,6 @@ msgstr "Étiquettes" -#: ../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/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4602,16 +4614,16 @@ msgstr "Nœuds" -#: ../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:271 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:275 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Membres" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 msgid "No pending tag conflicts to be resolved" msgstr "Aucun conflit d’attribut n’est résolu" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "Tags({0} conflict)" @@ -4620,5 +4632,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4627,9 +4639,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "Nodes(resolved)" msgstr "Nœuds (résolus)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4638,17 +4650,17 @@ "la liste de nœuds de ce chemin" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Nodes(with conflicts)" msgstr "Nœuds (avec conflits)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 msgid "Pending conflicts in the node list of this way" msgstr "Conflits à résoudre dans la liste des nœuds de ce chemin" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:194 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Members(resolved)" msgstr "Membres (résolus)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4658,25 +4670,25 @@ "dans la liste des membres de cette relation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Members(with conflicts)" msgstr "Membres (avec conflits)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending conflicts in the member list of this relation" msgstr "Conflits à résoudre dans la liste des membres de cette relation" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 msgid "No pending property conflicts" msgstr "Pas de conflit de propriétés" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:211 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Properties(with conflicts)" msgstr "Propriétés (avec conflits)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 msgid "Pending property conflicts to be resolved" msgstr "Des conflits de propriété sont en attente de résolution" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:292 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 msgid "Conflict Resolution" msgstr "Résolution de conflits" @@ -4722,5 +4734,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 msgid "My version" msgstr "Ma version" @@ -4731,6 +4743,6 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" msgstr "Version fusionnée" @@ -4745,5 +4757,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 msgid "Their version" msgstr "Leur version" @@ -4817,9 +4829,9 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:643 msgid "Copy all my elements to the target" -msgstr "" +msgstr "Copier tous mes éléments dans la cible" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:669 msgid "Copy all their elements to the target" -msgstr "" +msgstr "Copier tous leurs éléments dans la cible" #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:696 @@ -4929,5 +4941,5 @@ msgstr "Nœud" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 msgid "Merged nodes not frozen yet. Cannot build resolution command." msgstr "" @@ -4935,5 +4947,5 @@ "commande de résolution" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:460 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:463 #, java-format msgid "" @@ -4944,19 +4956,19 @@ "serveur
Détails :{0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 msgid "Communication with server failed" msgstr "La communication avec le serveur a échoué" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:540 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:509 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:543 msgid "Yes, undelete them too" msgstr "Oui, les restaurer également" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:507 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:541 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 msgid "No, cancel operation" msgstr "Non, annuler l’opération" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514 #, java-format msgid "" @@ -4969,9 +4981,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:524 msgid "Undelete additional nodes?" msgstr "Restaurer ces nœuds également ?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:548 #, java-format msgid "" @@ -4984,13 +4996,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:555 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:558 msgid "Undelete dependent primitives?" msgstr "Restaurer les primitives ?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 msgid "Properties in my dataset, i.e. the local dataset" msgstr "Propriétés de mon jeu de données, i.e. les données locales" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5000,91 +5012,91 @@ "éléments lorsque la fusion sera appliquée." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Propriétés de leur jeu de données, i.e. les données du serveur" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 msgid "Coordinates:" msgstr "Coordonnées :" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 msgid "Deleted State:" msgstr "Etat supprimé :" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 msgid "Visible State:" msgstr "État visible :" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 msgid "Referenced by:" msgstr "Référencé par :" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(aucun)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:390 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "supprimé" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:392 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 msgid "not deleted" msgstr "non supprimé" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 msgid "visible (on the server)" msgstr "visible (sur le serveur)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:401 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 msgid "not visible (on the server)" msgstr "non visible (sur le serveur)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 msgid "Keep a clone of the local version" msgstr "Garder une copie de la version locale" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:410 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 msgid "Physically delete from local dataset" msgstr "Supprimer physiquement du jeu de données local" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:528 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "Conserver mes coordonnées" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:543 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 msgid "Keep their coordiates" msgstr "Conserver leurs coordonnées" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:558 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 msgid "Undecide conflict between different coordinates" msgstr "Ne pas résoudre le conflit de coordonnées" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:573 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 msgid "Keep my deleted state" msgstr "Conserver mon état supprimé" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 msgid "Keep their deleted state" msgstr "Conserver leur état supprimé" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:603 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 msgid "Undecide conflict between deleted state" msgstr "Ne pas résoudre le conflit d’état" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 msgid "Keep my visible state" msgstr "Conserver mon état de visibilité" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 msgid "Yes, reset the id" msgstr "Oui, réinitialiser l’id" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:638 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 #, java-format msgid "" @@ -5094,17 +5106,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:645 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 msgid "Reset id to 0" msgstr "Réinitialisation de l’id à 0" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 msgid "Keep their visible state" msgstr "Conserver l’état de visbilité du serveur" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:674 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 msgid "Yes, purge it" msgstr "Oui, le supprimer" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:679 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 #, java-format msgid "" @@ -5115,9 +5127,9 @@ "données.
Êtes-vous d’accord ?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:684 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 msgid "Remove from dataset" msgstr "Suppression du jeu de données" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 msgid "Undecide conflict between visible state" msgstr "Conflit non résolu entre deux états de visiblité" @@ -5190,25 +5202,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:128 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:129 msgid "My version (local dataset)" msgstr "Ma version (jeu de données local)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:151 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:152 msgid "Their version (server dataset)" msgstr "Leur version (jeu de données du serveur)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:275 msgid "Keep the selected key/value pairs from the local dataset" msgstr "Conserver la paire clé/valeur locale sélectionnée" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:304 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:305 msgid "Keep the selected key/value pairs from the server dataset" msgstr "Conserver la paire clé/valeur distante sélectionnée" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:397 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:398 msgid "Undecide" msgstr "Ne pas départager" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:400 msgid "Mark the selected tags as undecided" msgstr "Marquer les étiquettes sélectionnées comme restant à départager" @@ -5251,5 +5263,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 msgid "Apply" msgstr "Appliquer" @@ -5488,4 +5500,6 @@ msgid "Select all objects assigned to the currently selected changesets" msgstr "" +"Sélectionner tous les objets assignés aux groupes de modifications " +"actuellement sélectionnés" #: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:359 @@ -5519,4 +5533,6 @@ msgid "Opens the Changeset Manager window for the selected changesets" msgstr "" +"Ouvre la fenêtre du Gestionnaire de groupes de modifications pour les " +"groupes de modifications sélectionnés" #: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:30 @@ -5558,14 +5574,14 @@ msgstr "Résoudre les conflits." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 #, java-format msgid "Conflicts: {0} unresolved" msgstr "Conflits : {0} non résolu" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:325 msgid "Resolve" msgstr "Résoudre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5573,5 +5589,5 @@ "liste ci-dessus." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 @@ -5694,5 +5710,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 @@ -5789,5 +5805,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1365 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5843,5 +5859,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:353 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -7123,4 +7139,6 @@ "> 0" msgstr "" +"La valeur actuelle de l'identifiant de groupe de modifications n'est pas " +"valide. Veuillez entrer un entier > 0" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/SingleChangesetDownloadPanel.java:143 @@ -7239,4 +7257,6 @@ msgid "Only changesets closed after the following date/time" msgstr "" +"Uniquement les groupes de modifications fermés après la date & heure " +"suivantes" #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java:786 @@ -7566,5 +7586,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7616,26 +7636,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 msgid "Tags and Members" msgstr "Étiquettes et membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Parent Relations" msgstr "Relations parentes" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 msgid "Child Relations" msgstr "Relations enfants" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:297 msgid "Apply Role:" msgstr "Appliquer Rôle:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299 msgid "Enter a role and apply it to the selected relation members" msgstr "Entrer un rôle et l'appliquer aux membres sélectionnés de la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "" "There is at least one member in this relation referring
to the " @@ -7648,14 +7668,14 @@ "circulaires ?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "Remove them, clean up relation" msgstr "Les enlever, nettoyer la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 msgid "Ignore them, leave relation as is" msgstr "Les ignorer, laisser la relation telle quelle." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:605 #, java-format msgid "" @@ -7665,9 +7685,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:615 msgid "Multiple members referring to same primitive" msgstr "Plusieurs membres se rapportent à la même primitive" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633 #, java-format msgid "" @@ -7677,5 +7697,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:674 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -7684,5 +7704,5 @@ "premier membre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:700 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -7691,5 +7711,5 @@ "dernier membre" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:727 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7699,5 +7719,5 @@ "cours, avant le premier membre sélectionné" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:761 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7707,5 +7727,5 @@ "cours, après le dernier membre sélectionné" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 msgid "Remove all members referring to one of the selected primitives" msgstr "" @@ -7713,15 +7733,15 @@ #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:796 msgid "Relation Editor: Remove Selected" msgstr "Éditeur de relation : supprimer la sélection" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:830 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:842 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 #, java-format msgid "" @@ -7730,76 +7750,76 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:864 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 msgid "Sort the relation members" msgstr "trier les membres de la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:886 msgid "Sort" msgstr "Trier" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:887 msgid "Relation Editor: Sort" msgstr "éditeur de relation : trier" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Reverse the order of the relation members" msgstr "Inverser l'ordre des membres de la relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Reverse" msgstr "Éditeur de relation: Inverser" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 msgid "Move the currently selected members up" msgstr "Déplacer les membres sélectionnés vers le haut" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:933 msgid "Relation Editor: Move Up" msgstr "Éditeur de relation : déplacer vers le haut" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 msgid "Move the currently selected members down" msgstr "Déplacer les membres sélectionnés vers le bas" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 msgid "Relation Editor: Move Down" msgstr "Éditeur de relation : déplacer vers le bas" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 msgid "Remove the currently selected members from this relation" msgstr "Supprimer le membre actuellement sélectionné de cette relation." #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 msgid "Relation Editor: Remove" msgstr "éditeur de relation : supprimer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 msgid "Delete the currently edited relation" msgstr "Supprimer la relation actuellement éditée." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 msgid "Yes, create a conflict and close" msgstr "Oui, créer un conflit et fermer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1075 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 msgid "Click to create a conflict and close this relation editor" msgstr "Cliquer pour créer un conflit et fermer cet éditeur de relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 msgid "No, continue editing" msgstr "Non, continuer à éditer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1081 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" @@ -7807,5 +7827,5 @@ "relation" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7814,5 +7834,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1105 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 #, java-format msgid "" @@ -7821,47 +7841,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 msgid "Apply the current updates" msgstr "Appliquer les mises-à-jour suivantes" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 msgid "Apply the updates and close the dialog" msgstr "Appliquer les changements et fermer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Cancel the updates and close the dialog" msgstr "Annuler les changements et fermer" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 msgid "Add an empty tag" msgstr "Ajouter un attribut vide" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 msgid "Download all incomplete members" msgstr "Télécharger tous les membres incomplets" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 msgid "Download Members" msgstr "Télécharger les membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 msgid "Relation Editor: Download Members" msgstr "Éditeur de relation : télécharger les membres" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 msgid "Download selected incomplete members" msgstr "Télécharger la sélection de membres incomplets" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 msgid "Sets a role for the selected members" msgstr "Définir un rôle pour les membres sélectionnés" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 msgid "Apply Role" msgstr "Appliquer le rôle" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7870,25 +7890,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "This is equal to deleting the roles of these primitives." msgstr "Èquivalent à suppimer les rôles de ces primitives." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 msgid "Do you really want to apply the new role?" msgstr "Voulez-vous vraiment appliquer le nouveau rôle?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1313 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 msgid "Yes, apply it" msgstr "Oui, l’appliquer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 msgid "No, do not apply" msgstr "Non, ne pas l’appliquer." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 msgid "Confirm empty role" msgstr "Confirmer le rôle vide" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 msgid "Edit the relation the currently selected relation member refers to" msgstr "éditer la relation en référence du membre de relation sélectionné" @@ -7934,13 +7954,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92 msgid "Load parent relations" msgstr "Charger les relations parentes" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 msgid "Loading parent relations" msgstr "Chargement des relations parentes." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141 msgid "Edit the currently selected relation" msgstr "éditer la relation sélectionnée" @@ -8753,4 +8773,5 @@ msgid "Upload to an existing changeset" msgstr "" +"Télécharger vers un groupe de modifications existant (sur le serveur OSM)" #: ../core/src/org/openstreetmap/josm/gui/io/ChangesetManagementPanel.java:98 @@ -9033,5 +9054,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:286 msgid "Close this dialog and resume editing in JOSM" -msgstr "" +msgstr "Fermer cette boîte de dialogue et reprendre l'édition dans JOSM" #: ../core/src/org/openstreetmap/josm/gui/io/SaveLayersDialog.java:317 @@ -9169,13 +9190,13 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:107 msgid "Initializing nodes to update ..." -msgstr "" +msgstr "Initialisation des noeuds à mettre à jour ..." #: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:123 msgid "Initializing ways to update ..." -msgstr "" +msgstr "Initialisation des voies à mettre à jour ..." #: ../core/src/org/openstreetmap/josm/gui/io/UpdatePrimitivesTask.java:132 msgid "Initializing relations to update ..." -msgstr "" +msgstr "Initialisation des relations à mettre à jour ..." #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:116 @@ -9229,13 +9250,13 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:367 msgid "Illegal upload comment" -msgstr "" +msgstr "Commentaire de téléchargement (vers le serveur OSM) illégal" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:376 msgid "Please enter a valid chunk size first" -msgstr "" +msgstr "Veuillez d'abord entrer une taille de bloc valide" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:377 msgid "Illegal chunk size" -msgstr "" +msgstr "Taille de bloc illégale" #: ../core/src/org/openstreetmap/josm/gui/io/UploadDialog.java:411 @@ -9485,4 +9506,6 @@ msgid "Upload in one request not possible (too many objects to upload)" msgstr "" +"Télécharger en une fois vers le serveur OSM n'est pas possible (trop " +"d'objets à télécharger)" #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:324 @@ -9521,5 +9544,5 @@ #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:411 msgid "Illegal chunk size <= 0. Please enter an integer > 1" -msgstr "" +msgstr "Taille de bloc illégale <= 0. Veuillez entrer un entier > 1" #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:413 @@ -9528,13 +9551,15 @@ msgid "Chunk size {0} exceeds max. changeset size {1} for server ''{2}''" msgstr "" +"la taille de bloc {0} dépasse la taille maximale pour un groupe de " +"modification {1}, pour le serveur ''{2}''" #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:415 msgid "Please enter an integer > 1" -msgstr "" +msgstr "Veuillez entrer un entier > 1" #: ../core/src/org/openstreetmap/josm/gui/io/UploadStrategySelectionPanel.java:422 #, java-format msgid "Value ''{0}'' is not a number. Please enter an integer > 1" -msgstr "" +msgstr "La valeur \"{0}\" n'est pas un nombre. Veuillez entrer un entier > 1" #: ../core/src/org/openstreetmap/josm/gui/io/UploadedObjectsSummaryPanel.java:52 @@ -9855,5 +9880,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:377 msgid "Click to close this dialog and continue editing" -msgstr "" +msgstr "Cliquer pour fermer ce dialogue et continuer l'édition" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:515 @@ -9887,5 +9912,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:732 msgid "Dataset consistency test" -msgstr "" +msgstr "Test de cohérence de l'ensemble de données" #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:738 @@ -9895,5 +9920,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:741 msgid "Following problems found:" -msgstr "" +msgstr "Les problèmes suivants ont été trouvés:" #: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:66 @@ -10043,10 +10068,10 @@ #, java-format msgid "Images with geo location in exif data ({0}/{1})" -msgstr "" +msgstr "Images avec géolocalisation dans les métadonnées EXIF ({0}/{1})" #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:527 #, java-format msgid "Images that are already tagged ({0}/{1})" -msgstr "" +msgstr "Images qui sont déjà taguées ({0}/{1})" #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/CorrelateGpxWithImages.java:533 @@ -10253,5 +10278,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:103 msgid "Delete image file from disk" -msgstr "" +msgstr "Supprimer le fichier de l'image du disque" #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:599 @@ -10264,5 +10289,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:624 msgid "Image file could not be deleted." -msgstr "" +msgstr "Le fichier de l'image n'a pas pu être supprimé." #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageDisplay.java:432 @@ -10308,5 +10333,5 @@ #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:107 msgid "Delete File from disk" -msgstr "" +msgstr "Effacer un fichier du disque" #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/ImageViewerDialog.java:114 @@ -10494,5 +10519,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:49 msgid "Use default settings" -msgstr "" +msgstr "Utiliser les paramètres par défaut" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:56 @@ -10519,9 +10544,11 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:125 msgid "Click to reset the OAuth settings to default values" -msgstr "" +msgstr "Cliquer pour réinitialiser les paramètres OAuth aux valeurs par défaut" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:131 msgid "Click to abort resetting to the OAuth default values" msgstr "" +"Cliquer pour annuler la réinitialisation des paramètres OAuth aux valeurs " +"par défaut" #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:138 @@ -10530,12 +10557,14 @@ "current custom settings are not saved." msgstr "" +"JOSM est sur le point de rétablir les paramètres OAuth aux valeurs par " +"défaut.
Les paramètres personnalisés actuels ne sont pas sauvés." #: ../core/src/org/openstreetmap/josm/gui/oauth/AdvancedOAuthPropertiesPanel.java:141 msgid "Overwrite custom OAuth settings?" -msgstr "" +msgstr "Écraser les paramètres OAuth personnalisés?" #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:58 msgid "Fully automatic" -msgstr "" +msgstr "Entièrement automatique" #: ../core/src/org/openstreetmap/josm/gui/oauth/AuthorizationProcedureComboBox.java:61 @@ -10637,4 +10666,6 @@ msgid "The user name cannot be empty. Please enter your OSM user name" msgstr "" +"Le nom d'utilisateur ne peut pas être vide. Veuillez entrer votre nom " +"d'utilisateur OSM" #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:430 @@ -10822,5 +10853,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:45 msgid "Allow to upload GPS traces" -msgstr "" +msgstr "Permettre de télécharger des traces GPS vers le serveur OSM" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:46 @@ -10840,5 +10871,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:61 msgid "Allow to read your preferences" -msgstr "" +msgstr "Permettre de lire vos préférences" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:62 @@ -10848,5 +10879,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:69 msgid "Allow to write your preferences" -msgstr "" +msgstr "Permettre d'écrire vos préférences" #: ../core/src/org/openstreetmap/josm/gui/oauth/OsmPrivilegesPanel.java:70 @@ -11031,5 +11062,5 @@ #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:251 msgid "Retrieving user info..." -msgstr "" +msgstr "Récupération des informations de l'utilisateur..." #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:49 @@ -11634,5 +11665,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:123 msgid "Enter a search expression" -msgstr "" +msgstr "Entrer une expression de recherche" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:169 @@ -11672,5 +11703,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:314 msgid "Download the list of available plugins" -msgstr "" +msgstr "Télécharger la liste des greffons disponibles" #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:343 @@ -11829,5 +11860,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java:109 msgid "Save the preferences and close the dialog" -msgstr "" +msgstr "Enregistrer les préférences et fermer la boîte de dialogue" #. some common tabs @@ -11923,5 +11954,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:73 msgid "Configure whether to create backup files" -msgstr "" +msgstr "Configurer si vous souhaitez créer des fichiers de sauvegarde" #. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on @@ -12085,10 +12116,10 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:113 msgid "Ask before updating" -msgstr "" +msgstr "Demander avant une mise à jour" #: ../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 "" +msgstr "Toujours mettre à jour sans demander" #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:80 @@ -12102,4 +12133,6 @@ "startup after an update of JOSM itself." msgstr "" +"Veuillez décider si JOSM mettra à jour automatiquement les greffons actifs " +"au démarrage, après une mise à jour de JOSM lui-même." #: ../core/src/org/openstreetmap/josm/gui/preferences/plugin/PluginUpdatePolicyPanel.java:96 @@ -12112,4 +12145,6 @@ "certain periode of time." msgstr "" +"Veuillez décider si JOSM mettra automatiquement à jour les greffons actifs, " +"après une certaine période de temps." #: ../core/src/org/openstreetmap/josm/gui/preferences/server/ApiUrlTestTask.java:51 @@ -12168,5 +12203,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59 msgid "Use Basic Authentication" -msgstr "" +msgstr "Utiliser l'authentification de base" #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:60 @@ -12181,5 +12216,5 @@ #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:68 msgid "Select to use OAuth as authentication mechanism" -msgstr "" +msgstr "Choisir d'utiliser OAuth comme mécanisme d'authentification" #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:106 @@ -14123,5 +14158,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:348 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:353 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -16698,12 +16733,10 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:291 -#, fuzzy msgid "Abort tag editing and close dialog" -msgstr "Appliquer les changements et fermer" +msgstr "" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:304 -#, fuzzy msgid "Apply edited tags and close dialog" -msgstr "Appliquer les changements et fermer" +msgstr "" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 @@ -30984,7 +31017,4 @@ msgstr "Sicile - Italie" -#~ msgid "" -#~ msgstr "" - #~ msgid "Move" #~ msgstr "Déplacer" @@ -32000,4 +32030,7 @@ #~ msgstr "Haut Palatinat Geofabrik.de" +#~ msgid "" +#~ msgstr "" + #~ msgid "Remove route nodes" #~ msgstr "Supprimer les nœuds du chemin" Index: applications/editors/josm/i18n/po/gl.po =================================================================== --- applications/editors/josm/i18n/po/gl.po (revision 20093) +++ applications/editors/josm/i18n/po/gl.po (revision 20140) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-21 09:35+0100\n" +"POT-Creation-Date: 2010-02-24 19:46+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-02-21 08:16+0000\n" +"X-Launchpad-Export-Date: 2010-02-24 18:31+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -69,6 +69,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:291 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 @@ -242,5 +242,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -386,5 +386,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -688,5 +688,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:989 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -811,5 +811,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 msgid "Duplicate" msgstr "Duplicar" @@ -1651,6 +1651,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215 msgid "No, abort" @@ -2366,5 +2366,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:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149 @@ -2933,5 +2933,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1111 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 msgid "Double conflict" msgstr "" @@ -2964,5 +2964,5 @@ #. should not happen #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 msgid "Cannot resolve undecided conflict." msgstr "" @@ -3138,10 +3138,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:53 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:71 #, java-format msgid "Main dataset does not include node {0}" @@ -3418,27 +3418,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:148 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:228 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:243 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:248 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3448,5 +3448,5 @@ #. 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:281 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 #, java-format msgid "" @@ -3591,6 +3591,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:291 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:313 +#: ../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}." @@ -3708,5 +3708,5 @@ #. darker blue #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:183 msgid "background" @@ -3948,5 +3948,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 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 msgid "Conflict" msgstr "Conflito" @@ -4198,5 +4198,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:936 #: ../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/dialogs/relation/ReferringRelationsBrowser.java:143 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:209 @@ -4434,14 +4434,14 @@ msgstr "" -#: ../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/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "" -#: ../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/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:235 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:239 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:507 @@ -4450,6 +4450,6 @@ msgstr "Etiquetas" -#: ../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/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4457,16 +4457,16 @@ msgstr "" -#: ../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:271 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:275 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Membros" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "Tags({0} conflict)" @@ -4475,5 +4475,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4482,26 +4482,26 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 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:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:194 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4509,25 +4509,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:211 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:292 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 msgid "Conflict Resolution" msgstr "" @@ -4573,5 +4573,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 msgid "My version" msgstr "" @@ -4582,6 +4582,6 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" msgstr "" @@ -4594,5 +4594,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 msgid "Their version" msgstr "" @@ -4761,9 +4761,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 msgid "Merged nodes not frozen yet. Cannot build resolution command." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:460 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:463 #, java-format msgid "" @@ -4772,19 +4772,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:540 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:509 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:543 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:507 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:541 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 msgid "No, cancel operation" msgstr "Non, cancelar a operación" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514 #, java-format msgid "" @@ -4797,9 +4797,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:524 msgid "Undelete additional nodes?" msgstr "Desfacer o borrado de nodos adicionais?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:548 #, java-format msgid "" @@ -4812,13 +4812,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:555 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:558 msgid "Undelete dependent primitives?" msgstr "Desfacer o borrado de primitivas dependentes?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "" "Properties in the merged element. They will replace properties in my " @@ -4826,91 +4826,91 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 msgid "Coordinates:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 msgid "Referenced by:" msgstr "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:390 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 #: ../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:392 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 msgid "not deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 msgid "visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:401 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 msgid "not visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 msgid "Keep a clone of the local version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:410 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:528 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:543 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:558 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:573 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:603 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:638 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 #, java-format msgid "" @@ -4920,17 +4920,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:645 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 msgid "Reset id to 0" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 msgid "Keep their visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:674 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 msgid "Yes, purge it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:679 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 #, java-format msgid "" @@ -4939,9 +4939,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:684 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 msgid "Remove from dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 msgid "Undecide conflict between visible state" msgstr "" @@ -5011,25 +5011,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:128 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:129 msgid "My version (local dataset)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:151 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:152 msgid "Their version (server dataset)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:275 msgid "Keep the selected key/value pairs from the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:304 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:305 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:397 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:398 msgid "Undecide" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:400 msgid "Mark the selected tags as undecided" msgstr "" @@ -5072,5 +5072,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 msgid "Apply" msgstr "" @@ -5377,14 +5377,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 #, java-format msgid "Conflicts: {0} unresolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:325 msgid "Resolve" msgstr "Resolver" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5392,5 +5392,5 @@ "superior." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 @@ -5511,5 +5511,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 @@ -5607,5 +5607,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1365 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5659,5 +5659,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:353 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -7347,5 +7347,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7394,26 +7394,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 msgid "Tags and Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Parent Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:297 msgid "Apply Role:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "" "There is at least one member in this relation referring
to the " @@ -7422,14 +7422,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:605 #, java-format msgid "" @@ -7439,9 +7439,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:615 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633 #, java-format msgid "" @@ -7451,15 +7451,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:674 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:700 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:727 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7467,5 +7467,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:761 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7473,20 +7473,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:796 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:830 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:842 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 #, java-format msgid "" @@ -7495,80 +7495,80 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:864 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:886 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:887 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Reverse the order of the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 msgid "Move the currently selected members up" msgstr "Mover os membros actualmente seleccionados cara arriba" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:933 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 msgid "Move the currently selected members down" msgstr "Mover os membros seleccionados actualmente cara abaixo" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1075 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1081 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7577,5 +7577,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1105 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 #, java-format msgid "" @@ -7584,47 +7584,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 msgid "Download Members" msgstr "Descargar Membros" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +msgid "Relation Editor: Download Members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 -msgid "Relation Editor: Download Members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7633,25 +7633,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1313 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -7696,13 +7696,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92 msgid "Load parent relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 msgid "Loading parent relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141 msgid "Edit the currently selected relation" msgstr "" @@ -13747,5 +13747,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:348 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:353 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." Index: applications/editors/josm/i18n/po/he.po =================================================================== --- applications/editors/josm/i18n/po/he.po (revision 20093) +++ applications/editors/josm/i18n/po/he.po (revision 20140) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-21 09:35+0100\n" +"POT-Creation-Date: 2010-02-24 19:46+0100\n" "PO-Revision-Date: 2010-01-23 21:36+0000\n" "Last-Translator: Tsvi Mostovicz \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-02-21 08:15+0000\n" +"X-Launchpad-Export-Date: 2010-02-24 18:30+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -69,6 +69,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:291 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 @@ -246,5 +246,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -390,5 +390,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -689,5 +689,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:989 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -811,5 +811,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 msgid "Duplicate" msgstr "שכפל" @@ -1646,6 +1646,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215 msgid "No, abort" @@ -2346,5 +2346,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:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149 @@ -2901,5 +2901,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1111 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 msgid "Double conflict" msgstr "" @@ -2932,5 +2932,5 @@ #. should not happen #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 msgid "Cannot resolve undecided conflict." msgstr "" @@ -3103,10 +3103,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:53 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:71 #, java-format msgid "Main dataset does not include node {0}" @@ -3381,27 +3381,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:148 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:228 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:243 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:248 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3411,5 +3411,5 @@ #. 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:281 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 #, java-format msgid "" @@ -3554,6 +3554,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:291 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:313 +#: ../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}." @@ -3671,5 +3671,5 @@ #. darker blue #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:183 msgid "background" @@ -3911,5 +3911,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 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 msgid "Conflict" msgstr "התנגשות" @@ -4161,5 +4161,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:936 #: ../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/dialogs/relation/ReferringRelationsBrowser.java:143 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:209 @@ -4394,14 +4394,14 @@ msgstr "" -#: ../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/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "תכונות" -#: ../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/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:235 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:239 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:507 @@ -4410,6 +4410,6 @@ msgstr "תוויות" -#: ../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/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4417,16 +4417,16 @@ msgstr "נקודות" -#: ../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:271 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:275 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "חברים" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "Tags({0} conflict)" @@ -4435,5 +4435,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4442,26 +4442,26 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "Nodes(resolved)" msgstr "נקודות (פתורות)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 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:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Nodes(with conflicts)" msgstr "נקודות (עם התנגשויות)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:194 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Members(resolved)" msgstr "חברים (פתורים)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4469,25 +4469,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Members(with conflicts)" msgstr "חברים (עם התנגשויות)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:211 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Properties(with conflicts)" msgstr "תכונות (עם התנגשויות)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:292 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 msgid "Conflict Resolution" msgstr "פתרון התנגשות" @@ -4533,5 +4533,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 msgid "My version" msgstr "הגירסה שלי" @@ -4542,6 +4542,6 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" msgstr "גירסה ממוזגת" @@ -4554,5 +4554,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 msgid "Their version" msgstr "הגירסה שלהם" @@ -4729,9 +4729,9 @@ msgstr "נקודה" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 msgid "Merged nodes not frozen yet. Cannot build resolution command." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:460 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:463 #, java-format msgid "" @@ -4740,19 +4740,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:540 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:509 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:543 msgid "Yes, undelete them too" msgstr "כן, בטל גם את המחיקה שלהם" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:507 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:541 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 msgid "No, cancel operation" msgstr "לא, בטל את הפעולה" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514 #, java-format msgid "" @@ -4765,9 +4765,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:524 msgid "Undelete additional nodes?" msgstr "בטל מחיקת נקודות נוספות?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:548 #, java-format msgid "" @@ -4780,13 +4780,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:555 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:558 msgid "Undelete dependent primitives?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "" "Properties in the merged element. They will replace properties in my " @@ -4794,91 +4794,91 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 msgid "Coordinates:" msgstr "קואורדינטות:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 msgid "Referenced by:" msgstr "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(לא כלום)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:390 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "מחוק" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:392 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 msgid "not deleted" msgstr "לא נמחק" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 msgid "visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:401 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 msgid "not visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 msgid "Keep a clone of the local version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:410 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:528 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "שמור את הקואורדינטות שלי" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:543 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 msgid "Keep their coordiates" msgstr "שמור את הקואורדינטות שלהם" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:558 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:573 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:603 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:638 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 #, java-format msgid "" @@ -4888,17 +4888,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:645 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 msgid "Reset id to 0" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 msgid "Keep their visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:674 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 msgid "Yes, purge it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:679 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 #, java-format msgid "" @@ -4907,9 +4907,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:684 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 msgid "Remove from dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 msgid "Undecide conflict between visible state" msgstr "" @@ -4979,25 +4979,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:128 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:129 msgid "My version (local dataset)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:151 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:152 msgid "Their version (server dataset)" msgstr "הגרסה שלהם (הנתונים על השרת)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:275 msgid "Keep the selected key/value pairs from the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:304 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:305 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:397 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:398 msgid "Undecide" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:400 msgid "Mark the selected tags as undecided" msgstr "" @@ -5040,5 +5040,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 msgid "Apply" msgstr "" @@ -5345,18 +5345,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 #, java-format msgid "Conflicts: {0} unresolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:325 msgid "Resolve" msgstr "פתור" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326 msgid "Open a merge dialog of all selected items in the list above." msgstr "פתח את תיבת דו-שיח עבור כל הפריטים הנבחרים ברשימה שלהלן." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 @@ -5477,5 +5477,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 @@ -5572,5 +5572,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1365 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5624,5 +5624,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:353 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -7308,5 +7308,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7355,26 +7355,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 msgid "Tags and Members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Parent Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 msgid "Child Relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:297 msgid "Apply Role:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "" "There is at least one member in this relation referring
to the " @@ -7383,14 +7383,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:605 #, java-format msgid "" @@ -7400,9 +7400,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:615 msgid "Multiple members referring to same primitive" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633 #, java-format msgid "" @@ -7412,15 +7412,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:674 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:700 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:727 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7428,5 +7428,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:761 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7434,20 +7434,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:796 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:830 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:842 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 #, java-format msgid "" @@ -7456,80 +7456,80 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:864 msgid "Select primitives for selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 msgid "Sort the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:886 msgid "Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:887 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Reverse the order of the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 msgid "Move the currently selected members up" msgstr "הזז את החברים הנבחרים מעלה" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:933 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 msgid "Move the currently selected members down" msgstr "הזז מטה את החברים שנבחרו" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 msgid "Remove the currently selected members from this relation" msgstr "" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1075 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1081 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7538,5 +7538,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1105 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 #, java-format msgid "" @@ -7545,47 +7545,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 msgid "Add an empty tag" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 msgid "Download Members" msgstr "הורד חברים" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +msgid "Relation Editor: Download Members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 -msgid "Relation Editor: Download Members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 msgid "Sets a role for the selected members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 msgid "Apply Role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7594,25 +7594,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1313 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -7657,13 +7657,13 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92 msgid "Load parent relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 msgid "Loading parent relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141 msgid "Edit the currently selected relation" msgstr "" @@ -13641,5 +13641,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:348 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:353 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." Index: applications/editors/josm/i18n/po/is.po =================================================================== --- applications/editors/josm/i18n/po/is.po (revision 20093) +++ applications/editors/josm/i18n/po/is.po (revision 20140) @@ -8,5 +8,5 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-21 09:35+0100\n" +"POT-Creation-Date: 2010-02-24 19:46+0100\n" "PO-Revision-Date: 2010-01-31 17:21+0000\n" "Last-Translator: Ævar Arnfjörð Bjarmason \n" @@ -16,5 +16,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-02-21 08:15+0000\n" +"X-Launchpad-Export-Date: 2010-02-24 18:31+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -69,6 +69,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:291 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 @@ -242,5 +242,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -387,5 +387,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -689,5 +689,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:989 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -811,5 +811,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 msgid "Duplicate" msgstr "Tvöfalda" @@ -1645,6 +1645,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215 msgid "No, abort" @@ -2349,5 +2349,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:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149 @@ -2907,5 +2907,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1111 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 msgid "Double conflict" msgstr "" @@ -2938,5 +2938,5 @@ #. should not happen #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 msgid "Cannot resolve undecided conflict." msgstr "" @@ -3110,10 +3110,10 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:53 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:71 #, java-format msgid "Main dataset does not include node {0}" @@ -3388,27 +3388,27 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:148 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 #, java-format msgid "Missing merge target for way with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:228 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 #, java-format msgid "Missing merge target for node with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for object with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:243 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:248 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3418,5 +3418,5 @@ #. 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:281 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 #, java-format msgid "" @@ -3561,6 +3561,6 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:291 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:313 +#: ../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}." @@ -3678,5 +3678,5 @@ #. darker blue #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:183 msgid "background" @@ -3918,5 +3918,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 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 msgid "Conflict" msgstr "Árekstrar" @@ -4162,5 +4162,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:936 #: ../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/dialogs/relation/ReferringRelationsBrowser.java:143 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:209 @@ -4395,14 +4395,14 @@ msgstr "" -#: ../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/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "" -#: ../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/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:235 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:239 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:507 @@ -4411,6 +4411,6 @@ msgstr "Tögg" -#: ../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/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4418,16 +4418,16 @@ msgstr "Hnútar" -#: ../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:271 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:275 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Stök" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 msgid "No pending tag conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "Tags({0} conflict)" @@ -4436,5 +4436,5 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4443,26 +4443,26 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "Nodes(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 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:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Nodes(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 msgid "Pending conflicts in the node list of this way" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:194 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Members(resolved)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4470,25 +4470,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Members(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending conflicts in the member list of this relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 msgid "No pending property conflicts" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:211 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Properties(with conflicts)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 msgid "Pending property conflicts to be resolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:292 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 msgid "Conflict Resolution" msgstr "" @@ -4534,5 +4534,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 msgid "My version" msgstr "" @@ -4543,6 +4543,6 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" msgstr "" @@ -4555,5 +4555,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 msgid "Their version" msgstr "" @@ -4722,9 +4722,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 msgid "Merged nodes not frozen yet. Cannot build resolution command." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:460 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:463 #, java-format msgid "" @@ -4733,19 +4733,19 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 msgid "Communication with server failed" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:540 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:509 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:543 msgid "Yes, undelete them too" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:507 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:541 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 msgid "No, cancel operation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514 #, java-format msgid "" @@ -4758,9 +4758,9 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:524 msgid "Undelete additional nodes?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:548 #, java-format msgid "" @@ -4773,13 +4773,13 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:555 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:558 msgid "Undelete dependent primitives?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "" "Properties in the merged element. They will replace properties in my " @@ -4787,91 +4787,91 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 msgid "Properties in their dataset, i.e. the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 msgid "Coordinates:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 msgid "Deleted State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 msgid "Visible State:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 msgid "Referenced by:" msgstr "" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:390 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:392 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 msgid "not deleted" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 msgid "visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:401 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 msgid "not visible (on the server)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 msgid "Keep a clone of the local version" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:410 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 msgid "Physically delete from local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:528 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:543 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 msgid "Keep their coordiates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:558 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 msgid "Undecide conflict between different coordinates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:573 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 msgid "Keep my deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 msgid "Keep their deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:603 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 msgid "Undecide conflict between deleted state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 msgid "Keep my visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 msgid "Yes, reset the id" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:638 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 #, java-format msgid "" @@ -4881,17 +4881,17 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:645 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 msgid "Reset id to 0" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 msgid "Keep their visible state" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:674 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 msgid "Yes, purge it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:679 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 #, java-format msgid "" @@ -4900,9 +4900,9 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:684 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 msgid "Remove from dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 msgid "Undecide conflict between visible state" msgstr "" @@ -4972,25 +4972,25 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:128 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:129 msgid "My version (local dataset)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:151 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:152 msgid "Their version (server dataset)" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:275 msgid "Keep the selected key/value pairs from the local dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:304 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:305 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:397 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:398 msgid "Undecide" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:400 msgid "Mark the selected tags as undecided" msgstr "" @@ -5033,5 +5033,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 msgid "Apply" msgstr "Vista" @@ -5338,18 +5338,18 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 #, java-format msgid "Conflicts: {0} unresolved" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:325 msgid "Resolve" msgstr "Leysa" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326 msgid "Open a merge dialog of all selected items in the list above." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 @@ -5470,5 +5470,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 @@ -5565,5 +5565,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1365 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 msgid "Create a copy of this relation and open it in another editor window" msgstr "Afrita þessi vensl og opna breytingarglugga fyrir afritið" @@ -5617,5 +5617,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:353 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -7303,5 +7303,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7352,26 +7352,26 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 msgid "Tags and Members" msgstr "Stök og tögg þeirra" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Parent Relations" msgstr "Yfirvensl" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 msgid "Child Relations" msgstr "Undirvensl" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:297 msgid "Apply Role:" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299 msgid "Enter a role and apply it to the selected relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "" "There is at least one member in this relation referring
to the " @@ -7380,14 +7380,14 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "Remove them, clean up relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 msgid "Ignore them, leave relation as is" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:605 #, java-format msgid "" @@ -7400,9 +7400,9 @@ "þennan hlut?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:615 msgid "Multiple members referring to same primitive" msgstr "Mörg stök benda á sama hlutinn" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633 #, java-format msgid "" @@ -7412,15 +7412,15 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:674 msgid "" "Add all primitives selected in the current dataset before the first member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:700 msgid "" "Add all primitives selected in the current dataset after the last member" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:727 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7428,5 +7428,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:761 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7434,20 +7434,20 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 msgid "Remove all members referring to one of the selected primitives" msgstr "" #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:796 msgid "Relation Editor: Remove Selected" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:830 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:842 msgid "" "Select relation members which refer to primitives in the current selection" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 #, java-format msgid "" @@ -7456,80 +7456,80 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:864 msgid "Select primitives for selected relation members" msgstr "Bæta völdum stökum á vallistann" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 msgid "Sort the relation members" msgstr "Raða stöknum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:886 msgid "Sort" msgstr "Raða" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:887 msgid "Relation Editor: Sort" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Reverse the order of the relation members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909 msgid "Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Reverse" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 msgid "Move the currently selected members up" msgstr "Færa valda meðlimi upp" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:933 msgid "Relation Editor: Move Up" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 msgid "Move the currently selected members down" msgstr "Færa valda meðlimi niður" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 msgid "Relation Editor: Move Down" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 msgid "Remove the currently selected members from this relation" msgstr "Fjarlægja völd stök úr þessum venslum" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 msgid "Relation Editor: Remove" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 msgid "Delete the currently edited relation" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 msgid "Yes, create a conflict and close" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1075 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 msgid "Click to create a conflict and close this relation editor" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 msgid "No, continue editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1081 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Click to return to the relation editor and to resume relation editing" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -7538,5 +7538,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1105 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 #, java-format msgid "" @@ -7545,47 +7545,47 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 msgid "Apply the current updates" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 msgid "Apply the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Cancel the updates and close the dialog" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 msgid "Add an empty tag" msgstr "Bæta við tómu taggi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 msgid "Download all incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 msgid "Download Members" msgstr "Niðurhala meðlimum" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 +msgid "Relation Editor: Download Members" +msgstr "" + #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 -msgid "Relation Editor: Download Members" -msgstr "" - -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 msgid "Download selected incomplete members" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 msgid "Sets a role for the selected members" msgstr "Vistar hlutverk fyrir völd stök" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 msgid "Apply Role" msgstr "Vista hlutverk" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -7594,25 +7594,25 @@ msgstr[1] "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "This is equal to deleting the roles of these primitives." msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 msgid "Do you really want to apply the new role?" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1313 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 msgid "Yes, apply it" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 msgid "No, do not apply" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 msgid "Confirm empty role" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 msgid "Edit the relation the currently selected relation member refers to" msgstr "Breyta venslunum sem valið stak bendir á" @@ -7657,13 +7657,13 @@ msgstr "ná einnig í fyrsta-stigs undirvensl yfirvenslanna" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92 msgid "Load parent relations" msgstr "" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 msgid "Loading parent relations" msgstr "Næ í yfirvensl" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141 msgid "Edit the currently selected relation" msgstr "" @@ -13638,5 +13638,5 @@ msgstr "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:348 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:353 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." Index: applications/editors/josm/i18n/po/it.po =================================================================== --- applications/editors/josm/i18n/po/it.po (revision 20093) +++ applications/editors/josm/i18n/po/it.po (revision 20140) @@ -5,7 +5,7 @@ "Project-Id-Version: josm 20081003\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-21 09:35+0100\n" -"PO-Revision-Date: 2010-02-20 00:40+0000\n" -"Last-Translator: Silvio Brera \n" +"POT-Creation-Date: 2010-02-24 19:46+0100\n" +"PO-Revision-Date: 2010-02-23 09:35+0000\n" +"Last-Translator: Davide Prade \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" @@ -13,5 +13,5 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Launchpad-Export-Date: 2010-02-21 08:17+0000\n" +"X-Launchpad-Export-Date: 2010-02-24 18:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" @@ -66,6 +66,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:291 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 @@ -248,5 +248,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -397,5 +397,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -702,5 +702,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:989 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -828,5 +828,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 msgid "Duplicate" msgstr "Duplica" @@ -1703,6 +1703,6 @@ #: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676 #: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215 msgid "No, abort" @@ -2454,5 +2454,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:347 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116 #: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149 @@ -3064,5 +3064,5 @@ #: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1111 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114 msgid "Double conflict" msgstr "Doppio conflitto" @@ -3099,5 +3099,5 @@ #. should not happen #: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68 -#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78 +#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79 msgid "Cannot resolve undecided conflict." msgstr "Impossibile risolvere il conflitto irrisolto" @@ -3275,10 +3275,10 @@ msgstr "Risolvi conflitto di versione per la relazione {0}" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:53 #, java-format msgid "Resolve conflicts in node list of way {0}" msgstr "Risolvi i conflitti nella lista dei nodi del percorso {0}" -#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70 +#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:71 #, java-format msgid "Main dataset does not include node {0}" @@ -3592,27 +3592,27 @@ "continuare a lavorare senza problemi." -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:148 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219 #, java-format msgid "Missing merge target for way with id {0}" msgstr "Manca la destinazione dell''unione per il percorso con id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164 -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:228 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235 #, java-format msgid "Missing merge target for node with id {0}" msgstr "Manca la destinazione dell''unione per il nodo con id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190 #, java-format msgid "Missing merge target for object with id {0}" msgstr "Manca la destinazione dell''unione per l''oggetto con id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:243 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250 #, java-format msgid "Missing merge target for relation with id {0}" msgstr "Manca la destinazione dell''unione per la relazione con id {0}" -#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:248 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255 #, java-format msgid "Missing merge target of type {0} with id {1}" @@ -3622,5 +3622,5 @@ #. 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:281 +#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292 #, java-format msgid "" @@ -3776,6 +3776,6 @@ "ci sono chiavi con valori multipli." -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:291 -#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:313 +#: ../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}." @@ -3895,5 +3895,5 @@ #. darker blue #: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:181 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:183 msgid "background" @@ -4139,5 +4139,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 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 msgid "Conflict" msgstr "Conflitto" @@ -4405,5 +4405,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:936 #: ../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/dialogs/relation/ReferringRelationsBrowser.java:143 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134 #: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:209 @@ -4650,14 +4650,14 @@ msgstr "il ruolo {0} non partecipa nella comparazione {1}" -#: ../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/conflict/pair/ConflictResolver.java:105 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178 msgid "Properties" msgstr "Proprietà" -#: ../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/conflict/pair/ConflictResolver.java:110 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:235 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:239 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132 #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:507 @@ -4666,6 +4666,6 @@ msgstr "Etichette" -#: ../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/conflict/pair/ConflictResolver.java:115 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139 #: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21 @@ -4673,16 +4673,16 @@ msgstr "Nodi" -#: ../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:271 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:275 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142 msgid "Members" msgstr "Membri" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174 msgid "No pending tag conflicts to be resolved" msgstr "Non c''è alcun conflitto di etichette in attesa di risoluzione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177 #, java-format msgid "Tags({0} conflict)" @@ -4691,5 +4691,5 @@ msgstr[1] "Etichette({0} conflitti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178 #, java-format msgid "{0} pending tag conflict to be resolved" @@ -4698,9 +4698,9 @@ msgstr[1] "{0} conflitti di etichetta rimanenti da risolvere" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186 msgid "Nodes(resolved)" msgstr "Nodi(risolti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187 msgid "" "Merged node list frozen. No pending conflicts in the node list of this way" @@ -4709,17 +4709,17 @@ "c''è alcun conflitto in attesa" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190 msgid "Nodes(with conflicts)" msgstr "Nodi(con conflitti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191 msgid "Pending conflicts in the node list of this way" msgstr "Conflitti in attesa nella lista di nodi di questo percorso" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:194 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196 msgid "Members(resolved)" msgstr "Membri(risolti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197 msgid "" "Merged member list frozen. No pending conflicts in the member list of this " @@ -4729,25 +4729,25 @@ "non c''è alcun conflitto in attesa" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200 msgid "Members(with conflicts)" msgstr "Membri(con conflitti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201 msgid "Pending conflicts in the member list of this relation" msgstr "Conflitti in attesa nella lista di membri di questa relazione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210 msgid "No pending property conflicts" msgstr "Non c''è alcun conflitto di proprietà in attesa" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:211 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213 msgid "Properties(with conflicts)" msgstr "Proprietà(con conflitti)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214 msgid "Pending property conflicts to be resolved" msgstr "Conflitti di proprietà in attesa di essere risolti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:292 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295 msgid "Conflict Resolution" msgstr "Risoluzione conflitto" @@ -4796,5 +4796,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 msgid "My version" msgstr "Versione personale" @@ -4807,6 +4807,6 @@ #: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140 msgid "Merged version" msgstr "Versione unita" @@ -4821,5 +4821,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:97 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 msgid "Their version" msgstr "La loro versione" @@ -5010,5 +5010,5 @@ msgstr "Nodo" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68 msgid "Merged nodes not frozen yet. Cannot build resolution command." msgstr "" @@ -5016,5 +5016,5 @@ "comando di risoluzione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:460 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:463 #, java-format msgid "" @@ -5025,19 +5025,19 @@ "server
Dettagli: {0}" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467 msgid "Communication with server failed" msgstr "Comunicazione con il server fallita" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:540 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:509 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:543 msgid "Yes, undelete them too" msgstr "Si, ripristina anche questo" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:507 -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:541 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544 msgid "No, cancel operation" msgstr "No, annulla l''operazione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514 #, java-format msgid "" @@ -5054,9 +5054,9 @@ "eliminati sul server.

Si desidera ripristinare anche questi nodi?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:521 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:524 msgid "Undelete additional nodes?" msgstr "Ripristina i nodi addizionali?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:548 #, java-format msgid "" @@ -5075,14 +5075,14 @@ "queste primitive?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:555 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:558 msgid "Undelete dependent primitives?" msgstr "Ripristina le primitive dipendenti?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87 msgid "Properties in my dataset, i.e. the local dataset" msgstr "" "Proprietà nell''insieme di dati personale, cioè l''insieme di dati locale" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93 msgid "" "Properties in the merged element. They will replace properties in my " @@ -5092,91 +5092,91 @@ "elementi personali non appena saranno applicate le decisioni." -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99 msgid "Properties in their dataset, i.e. the server dataset" msgstr "Proprietà nel loro insieme di dati, cioè l''insieme di dati del server" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:114 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115 msgid "Coordinates:" msgstr "Coordinate:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:188 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189 msgid "Deleted State:" msgstr "Stato eliminato:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265 msgid "Visible State:" msgstr "Stato visibile:" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341 msgid "Referenced by:" msgstr "Referenziato da:" -#: ../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 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23 msgid "(none)" msgstr "(nessuno/a)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:390 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77 msgid "deleted" msgstr "cancellato" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:392 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393 msgid "not deleted" msgstr "non eliminato" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400 msgid "visible (on the server)" msgstr "visibile (sul server)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:401 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402 msgid "not visible (on the server)" msgstr "non visibile (sul server)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:408 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409 msgid "Keep a clone of the local version" msgstr "Mantieni un clone della versione locale" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:410 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411 msgid "Physically delete from local dataset" msgstr "Elimina fisicamente dall''insieme di dati locale" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:528 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529 msgid "Keep my coordiates" msgstr "Mantieni le mie coordinate" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:543 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544 msgid "Keep their coordiates" msgstr "Mantieni le loro coordinate" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:558 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559 msgid "Undecide conflict between different coordinates" msgstr "Marca come irrisolto il conflitto tra coordinate differenti" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:573 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574 msgid "Keep my deleted state" msgstr "Mantieni il mio stato eliminato" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589 msgid "Keep their deleted state" msgstr "Mantieni il loro stato eliminato" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:603 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604 msgid "Undecide conflict between deleted state" msgstr "Marca come irrisolto il conflitto tra stati eliminati" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619 msgid "Keep my visible state" msgstr "Mantieni il mio stato visibile" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634 msgid "Yes, reset the id" msgstr "Si, reimposta l''id" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:638 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639 #, java-format msgid "" @@ -5189,17 +5189,17 @@ "server le assegnerà
un nuovo identificativo.
Si è d''accordo?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:645 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646 msgid "Reset id to 0" msgstr "Reimposta l''id a 0" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:659 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660 msgid "Keep their visible state" msgstr "Mantieni il loro stato visibile" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:674 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675 msgid "Yes, purge it" msgstr "Si, elimina" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:679 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680 #, java-format msgid "" @@ -5210,9 +5210,9 @@ "
dall''insieme di dati.
Si è d''accordo?" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:684 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685 msgid "Remove from dataset" msgstr "Elimina dall''insieme di dati" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:698 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699 msgid "Undecide conflict between visible state" msgstr "Conflitto irrisolto tra stati di visibilità" @@ -5287,27 +5287,27 @@ msgstr "Impossibile marcare come irrisolto l''elemento oggetto di unione" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:128 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:129 msgid "My version (local dataset)" msgstr "Versione personale (insieme di dati locale)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:151 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:152 msgid "Their version (server dataset)" msgstr "Loro versione (insieme dei dati del server)" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:274 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:275 msgid "Keep the selected key/value pairs from the local dataset" msgstr "" "Mantieni la coppia chiave/valore selezionata dall''insieme di dati locale" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:304 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:305 msgid "Keep the selected key/value pairs from the server dataset" msgstr "" "Mantieni la coppia chiave/valore selezionata dall''insieme di dati del server" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:397 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:398 msgid "Undecide" msgstr "Irrisolto" -#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:399 +#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:400 msgid "Mark the selected tags as undecided" msgstr "Marca le etichette selezionate come irrisolte" @@ -5352,5 +5352,5 @@ #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124 msgid "Apply" msgstr "Applica" @@ -5693,14 +5693,14 @@ msgstr "Risolvi i conflitti." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168 #, java-format msgid "Conflicts: {0} unresolved" msgstr "Conflitti: {0} non risolti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:325 msgid "Resolve" msgstr "Risolvi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326 msgid "Open a merge dialog of all selected items in the list above." msgstr "" @@ -5708,5 +5708,5 @@ "sopra." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346 #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117 #: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105 @@ -5833,5 +5833,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:282 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94 #: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148 #: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513 @@ -5928,5 +5928,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1365 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 msgid "Create a copy of this relation and open it in another editor window" msgstr "" @@ -5982,5 +5982,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:299 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:349 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:353 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17 msgid "Selection" @@ -7740,5 +7740,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095 msgid "Conflict in data" msgid_plural "Conflicts in data" @@ -7791,26 +7791,26 @@ msgstr "({0}/{1}): Scaricamento relazione ''''{2}''''..." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154 msgid "Tags and Members" msgstr "Etichette e Membri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164 msgid "Parent Relations" msgstr "Relazioni da cui dipende" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157 msgid "Child Relations" msgstr "Relazioni figlie" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:297 msgid "Apply Role:" msgstr "Applica ruolo:" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:295 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299 msgid "Enter a role and apply it to the selected relation members" msgstr "Inserire un ruolo e applicarlo ai membri della relazione selezionata" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575 msgid "" "There is at least one member in this relation referring
to the " @@ -7823,14 +7823,14 @@ "circolari?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583 msgid "Remove them, clean up relation" msgstr "Rimuovili, ripulisci la relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582 msgid "Ignore them, leave relation as is" msgstr "Ignorali, mantieni la relazione com'è" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:605 #, java-format msgid "" @@ -7843,9 +7843,9 @@ "aggiungere un altro membro alla relazione?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:615 msgid "Multiple members referring to same primitive" msgstr "Più membri fanno riferimento alla stessa primitiva" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633 #, java-format msgid "" @@ -7858,5 +7858,5 @@ "''''{0}'''' omessa." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:674 msgid "" "Add all primitives selected in the current dataset before the first member" @@ -7865,5 +7865,5 @@ "del primo membro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:700 msgid "" "Add all primitives selected in the current dataset after the last member" @@ -7872,5 +7872,5 @@ "l''ultimo membro" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:727 msgid "" "Add all primitives selected in the current dataset before the first selected " @@ -7880,5 +7880,5 @@ "del primo membro selezionato" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:761 msgid "" "Add all primitives selected in the current dataset after the last selected " @@ -7888,5 +7888,5 @@ "l''ultimo membro selezionato" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 msgid "Remove all members referring to one of the selected primitives" msgstr "" @@ -7894,10 +7894,10 @@ #. putValue(NAME, tr("Remove Selected")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:796 msgid "Relation Editor: Remove Selected" msgstr "Editor delle relazioni: Rimuovi selezione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:830 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:842 msgid "" "Select relation members which refer to primitives in the current selection" @@ -7906,5 +7906,5 @@ "selezione corrente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840 #, java-format msgid "" @@ -7915,81 +7915,81 @@ "selezione corrente" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:864 msgid "Select primitives for selected relation members" msgstr "Seleziona le primitive per i membri della relazione selezionata" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 msgid "Sort the relation members" msgstr "Ordina i membri della relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:886 msgid "Sort" msgstr "Ordina" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:887 msgid "Relation Editor: Sort" msgstr "Editor delle relazioni: Ordina" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 msgid "Reverse the order of the relation members" msgstr "Inverti l''ordine dei membri della relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909 msgid "Reverse" msgstr "Inverti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910 msgid "Relation Editor: Reverse" msgstr "Editor delle relazioni: Inverti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 msgid "Move the currently selected members up" msgstr "Sposta in alto i membri attualmente selezionati" #. putValue(NAME, tr("Move Up")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:933 msgid "Relation Editor: Move Up" msgstr "Editor delle relazioni: Sposta in alto" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 msgid "Move the currently selected members down" msgstr "Sposta in basso i membri attualmente selezionati" #. putValue(NAME, tr("Move Down")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952 msgid "Relation Editor: Move Down" msgstr "Editor delle relazioni: Sposta in basso" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 msgid "Remove the currently selected members from this relation" msgstr "Rimuovi i membri correntemente selezionati da questa relazione" #. putValue(NAME, tr("Remove")); -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971 msgid "Relation Editor: Remove" msgstr "Editor delle relazioni: Rimuovi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987 msgid "Delete the currently edited relation" msgstr "Elimina la relazione correntemente modificata" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076 msgid "Yes, create a conflict and close" msgstr "Si, crea un conflitto e chiudi" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1075 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078 msgid "Click to create a conflict and close this relation editor" msgstr "" "Cliccare per creare un conflitto e chiudere questo editor delle relazioni" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082 msgid "No, continue editing" msgstr "No, continua la modifica" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1081 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084 msgid "Click to return to the relation editor and to resume relation editing" msgstr "Cliccare per ritornare alla modifica della relazione" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091 msgid "" "This relation has been changed outside of the editor.
You cannot " @@ -8001,5 +8001,5 @@ "desidera creare un conflitto e chiudere l''editor?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1105 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108 #, java-format msgid "" @@ -8011,47 +8011,47 @@ "riprovare." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122 msgid "Apply the current updates" msgstr "Applica gli aggiornamenti correnti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155 msgid "Apply the updates and close the dialog" msgstr "Applica gli aggiornamenti e chiudi la finestra" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189 msgid "Cancel the updates and close the dialog" msgstr "Annulla gli aggiornamenti e chiudi la finestra" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206 msgid "Add an empty tag" msgstr "Aggiungi una etichetta vuota" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1216 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 msgid "Download all incomplete members" msgstr "Scarica tutti i membri incompleti" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256 msgid "Download Members" msgstr "Scarica i membri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257 msgid "Relation Editor: Download Members" msgstr "Editor delle relazioni: Scarica membri" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254 msgid "Download selected incomplete members" msgstr "Scarica i membri incompleti selezionati" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293 msgid "Sets a role for the selected members" msgstr "Imposta un ruolo ai membri selezionati" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295 msgid "Apply Role" msgstr "Applica Ruolo" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1306 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 #, java-format msgid "You are setting an empty role on {0} primitive." @@ -8060,25 +8060,25 @@ msgstr[1] "Si sta impostando un ruolo vuoto su {0} primitive." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312 msgid "This is equal to deleting the roles of these primitives." msgstr "Questo equivale all''eliminazione dei ruoli di queste primitive." -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1311 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 msgid "Do you really want to apply the new role?" msgstr "Si desidera veramente applicare il nuovo ruolo?" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1313 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316 msgid "Yes, apply it" msgstr "Si, applica" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317 msgid "No, do not apply" msgstr "No, non applicare" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323 msgid "Confirm empty role" msgstr "Conferma ruolo vuoto" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391 msgid "Edit the relation the currently selected relation member refers to" msgstr "" @@ -8133,13 +8133,13 @@ msgstr "inclusi i figli diretti delle relazioni da cui dipendono" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92 msgid "Load parent relations" msgstr "Carica le relazioni da cui dipende" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108 msgid "Loading parent relations" msgstr "Caricamento delle relazioni da cui dipende" -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141 msgid "Edit the currently selected relation" msgstr "Modifica la relazione correntemente selezionata" @@ -11046,4 +11046,9 @@ "advanced setting and try again." msgstr "" +"Il processo automatico per l''ottenimento di un token di accesso " +"OAuth
dal server OSM è fallito perché JOSM non è in grado di " +"costruire
un indirizzo URL di accesso valido sulla base dell''indirizzo " +"URL di autorizzazione OAuth ''{0}''.

Si prega di controllare le " +"proprie preferenze avanzate e di riprovare." #: ../core/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java:496 @@ -11322,4 +11327,11 @@ "" msgstr "" +"JOSM ha ottenuto con successo un token di richiesta. JOSM ora aprirà " +"una pagina di autorizzazione in un browser esterno. Si prega di accedere con " +"le proprie credenziali OSM e di seguire le istruzioni per autorizzare il " +"token di richiesta. In seguito ritornare a questa finestra e cliccare su " +"{0}

Se non avviene l''avvio del browser esterno si " +"può copiare il seguente indirizzo URL di autorizzazione ed incollarlo nella " +"barra degli indirizzi del proprio browser." #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:275 @@ -11338,4 +11350,7 @@ "authorization to the OSM server.

The access token is: " msgstr "" +"JOSM ha ottenuto con successo un token di accesso. Ora si può " +"accettare questo token. JOSM lo utilizzerà in futuro per l''autenticazione e " +"l''autorizzazione sul server OSM.

Il token di accesso è: " #: ../core/src/org/openstreetmap/josm/gui/oauth/SemiAutomaticAuthorizationUI.java:348 @@ -11380,4 +11395,7 @@ "''{3}''." msgstr "" +"E'' stato utilizzato con successo il token di accesso ''{0}'' " +"per
accedere al server OSM su ''{1}''.
Si sta accedendo al server OSM " +"come l''utente ''{2}'' con identificativo ''{3}''." #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:154 @@ -11393,4 +11411,8 @@ "token." msgstr "" +"E'' fallito l''accesso al server OSM ''{0}''
con il token di " +"accesso ''{0}''.
Il server ha rifiutato il token di accesso come non " +"autorizzato. Non si sarà quindi
in grado di accedere ad alcuna risorsa " +"protetta su questo server utilizzando questo token." #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:172 @@ -11410,4 +11432,9 @@ "resources." msgstr "" +"Il token di accesso ''{1}'' è conosciuto dal server OSM ''{0}''." +"
Però la verifica di ottenimento dei dettagli utente per questo token è " +"fallita.
A seconda della tipologia di permessi assegnati a questo token " +"potrebbe non essere possibile
caricare dati, caricare tracciati GPS, e/o " +"accedere ad altre risorse protette." #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:190 @@ -11423,4 +11450,9 @@ "Carefully check the server
URL and your Internet connection." msgstr "" +"Fallito l''ottenimento delle informazioni associate all''utente " +"corrente dal server OSM ''{0}''.
Questo probabilmente non è un problema " +"causato dal token di accesso oggetto di verifica, bensì
un problema con " +"la configurazione del server. Controllare attentamente l''indirizzo " +"URL
del server e la propria connessione ad internet." #: ../core/src/org/openstreetmap/josm/gui/oauth/TestAccessTokenTask.java:218 @@ -12135,4 +12167,7 @@ "started. So you need to restart JOSM to see your changes.

" msgstr "" +"

Notare che le scorciatoie sono assegnate alle corrispondenti azioni " +"durante l''avvio di JOSM. Quindi è necessario riavviare JOSM per " +"vedere le proprie modifiche.

" #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:167 @@ -12144,4 +12179,9 @@ "

" msgstr "" +"

Inoltre, le scorciatoie sono attivate quando le azioni sono assegnate ad " +"una voce di menu di un pulsante per la prima volta. Quindi alcune delle " +"proprie modifiche potrebbero non essere attive finché non si riavvia --- " +"però anche senza la gestione delle collisioni. Questa è un''altra ragione " +"per riavviare JOSM dopo aver effettuato delle modifiche qui.

" #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:170 @@ -12159,4 +12199,16 @@ "p>" msgstr "" +"

Si dovrebbe sapere che la lista di selezione dei tasti nella pagina " +"seguente contiene tutti quelli esistenti su ogni tipologia di tastiera che " +"Java conosce, e non solamente quelli presenti sulla propria. Si prega quindi " +"di utilizzare soltanto i valori che corrispondono ad un tasto reale sulla " +"propria tastiera. Quindi se la propria tastiera non contiene un tasto " +"''Copia'' (le tastiere dei PC non lo hanno, al contrario di quelle di Sun) " +"non utilizzarlo. Ci sono inoltre elencati anche ''valori'' che corrispondono " +"ad una scorciatoia sulla propria tastiera (es. '':''/Due punti). Si prega di " +"utilizzare invece la chiave di base ('';''/Punto e virgola sulle tastiere " +"americane, ''.''/Punto sulle tastiere italiane, ecc.). Se non si fa ciò si " +"può incorrere a dei conflitti, siccome JOSM non può sapere che Ctrl+Shift+. " +"e Ctrl+: sono in realtà la stessa cosa su una tastiera italiana.

" #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:177 @@ -12172,4 +12224,9 @@ "already taken, it will assign a random shortcut instead.

" msgstr "" +"

L''ultima pagina elenca le chiavi che JOSM assegnerà automaticamente alle " +"scorciatoie. Per tutte e quattro le tipologie di scorciatoie ci sono tre " +"alternative. JOSM proverà queste alternative nell'ordine elencato durante la " +"gestione di un conflitto. Se tutte le alternative corrisponderanno ad una " +"scorciatoia già presente, allora verrà assegnata una scorciatoia casuale.

" #: ../core/src/org/openstreetmap/josm/gui/preferences/PrefJPanel.java:182 @@ -12617,4 +12674,8 @@ "spelling of ''{0}'' and validate again." msgstr "" +"Il server delle API di OSM su ''{0}'' non ha restituito una risposta " +"valida.
E'' come se ''{0}'' non fosse un server delle API di OSM.
Si " +"prega di controllare la digitazione di ''{0}'' e di validare nuovamente." #: ../core/src/org/openstreetmap/josm/gui/preferences/server/AuthenticationPreferencesPanel.java:59 @@ -13131,4 +13192,7 @@ "time. Will not use a proxy." msgstr "" +"Attenzione: la JVM non è configurata per ottenere i proxy dalle impostazioni " +"si sistema. Il parametro ''java.net.useSystemProxies'' non era presente " +"all''avvio. Non verrà utilizzato alcun proxy." #: ../core/src/org/openstreetmap/josm/io/DiffResultProcessor.java:83 @@ -14550,4 +14614,7 @@ "file a bug report." msgstr "" +"E'' stata generata una eccezione inaspettata.
Questo è sempre un errore " +"di programmazione. Se si sta utilizzando l''ultima
versione di JOSM, si " +"prega gentilmente di effettuare una segnalazione per questo problema." #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:69 @@ -14560,4 +14627,7 @@ "sure you have updated to the latest version of JOSM here:" msgstr "" +"E'' stato riscontrato un errore in JOSM. Prima di procedere con la " +"segnalazione del problema, assicurarsi di aver aggiornato JOSM all''ultima " +"versione che si trova qui:" #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:121 @@ -14576,4 +14646,7 @@ "supply as much detail as possible." msgstr "" +"Le informazioni inerenti al problema sono state già riempite di seguito. Si " +"prega di includere la procedura per riprodurre l''errore e di fornire il " +"maggior numero di dettagli possibile." #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:129 @@ -14582,4 +14655,6 @@ "information below at this URL:" msgstr "" +"In alternativa, se non funziona, si possono riportare le informazioni " +"manualmente su questo indirizzo URL:" #: ../core/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:136 @@ -14812,5 +14887,5 @@ "" -#: ../core/src/org/openstreetmap/josm/tools/I18n.java:348 +#: ../core/src/org/openstreetmap/josm/tools/I18n.java:353 #, java-format msgid "Unable to find translation for the locale {0}. Reverting to {1}." @@ -17058,9 +17133,9 @@ #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:492 msgid "Route patterns ..." -msgstr "" +msgstr "Schemi di itinerario ..." #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:493 msgid "Edit Route patterns for public transport" -msgstr "" +msgstr "Modifica gli schemi di itinerario per il trasporto pubblico" #: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:505 @@ -17432,12 +17507,10 @@ #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:291 -#, fuzzy msgid "Abort tag editing and close dialog" -msgstr "Applica gli aggiornamenti e chiudi la finestra" +msgstr "Annulla la modifica all''etichetta e chiudi la finestra" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:304 -#, fuzzy msgid "Apply edited tags and close dialog" -msgstr "Applica gli aggiornamenti e chiudi la finestra" +msgstr "Applica le etichette modificate e chiudi la finestra" #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53 @@ -31760,7 +31833,4 @@ msgstr "Sicilia - Italia" -#~ msgid "" -#~ msgstr "" - #~ msgid "No data imported." #~ msgstr "Nessun dato importato." @@ -32803,4 +32873,7 @@ #~ msgstr "Rimuovi nodi dell'itinerario" +#~ msgid "" +#~ msgstr "" + #~ msgid "" #~ "Plugin archive already available. Do you want to download the current " Index: applications/editors/josm/i18n/po/ja.po =================================================================== --- applications/editors/josm/i18n/po/ja.po (revision 20093) +++ applications/editors/josm/i18n/po/ja.po (revision 20140) @@ -8,14 +8,17 @@ "Project-Id-Version: josm\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-21 09:35+0100\n" -"PO-Revision-Date: 2010-02-18 12:47+0000\n" -"Last-Translator: Mage Whopper \n" -"Language-Team: Japanese \n" +"POT-Creation-Date: 2010-02-24 19:46+0100\n" +"PO-Revision-Date: 2010-02-23 08:09+0000\n" +"Last-Translator: Hiroshi Miura \n" +"Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Launchpad-Export-Date: 2010-02-21 08:12+0000\n" +"X-Launchpad-Export-Date: 2010-02-24 18:28+0000\n" "X-Generator: Launchpad (build Unknown)\n" +"X-Poedit-Country: JAPAN\n" +"X-Poedit-Language: Japanese\n" +"X-Poedit-SourceCharset: utf-8\n" #. FIXME why is help not a JosmAction? @@ -69,6 +72,6 @@ #: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:291 #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189 #: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415 @@ -249,5 +252,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120 #: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373 @@ -397,5 +400,5 @@ #: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80 #: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157 #: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375 @@ -698,5 +701,5 @@ #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276 #: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:989 #: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142 @@ -821,5 +824,5 @@ #: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21 #: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498 -#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368 +#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371 msgid "Duplicate" msgstr "複製" @@ -853,5 +856,5 @@ #, java-format msgid "Copy {1} of {0}" -msgstr "" +msgstr "{0} の{1} をコピー" #.