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"