Index: /applications/editors/josm/plugins/lang/de/de.po =================================================================== --- /applications/editors/josm/plugins/lang/de/de.po (revision 9883) +++ /applications/editors/josm/plugins/lang/de/de.po (revision 9884) @@ -12,6 +12,6 @@ "Project-Id-Version: de\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-08-15 13:58+0200\n" -"PO-Revision-Date: 2008-08-15 14:01+0200\n" +"POT-Creation-Date: 2008-08-15 21:23+0200\n" +"PO-Revision-Date: 2008-08-15 21:27+0200\n" "Last-Translator: Dirk Stöcker \n" "Language-Team: \n" @@ -109,29 +109,29 @@ msgstr "Fehler beim Parsen: ungültige Dokumentstruktur für ein GPX Dokument" -#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:102 +#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:103 msgid "Provide a brief comment as to the changes to you are uploading:" msgstr "Angabe eines kurzes Kommentars über die hochzuladenden Änderungen:" -#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:103 +#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:104 msgid "Commit comment" msgstr "Änderungskommentar" -#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:123 +#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:130 #, java-format msgid "Upload {0} {1} (id: {2}) {3}% {4}/{5} ({6} left)..." msgstr "Überspiele {0} {1} (id: {2}) {3}% {4}/{5} ({6} verbleiben)..." -#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:133 +#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:146 #, java-format msgid "An error occoured: {0}" msgstr "Ein Fehler ist aufgetreten: {0}" -#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:150 +#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:174 msgid "Opening changeset..." msgstr "Öffne Änderungssatz..." -#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:208 -#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:284 -#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:427 +#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:234 +#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:327 +#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:484 #: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:184 #: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:702 @@ -139,7 +139,11 @@ msgstr "Rechner unbekannt" -#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:228 +#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:269 msgid "Closing changeset..." msgstr "Schließe Änderungssatz..." + +#: ../../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:529 +msgid "Transfer aborted due to error (will wait now 5 seconds):" +msgstr "Übertragung wegen Fehlers abgebrochen (Warte 5 Sekunden):" #: ../../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:50 @@ -217,5 +221,5 @@ #: ../../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:65 -#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:247 +#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314 #: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:79 #: ../../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 @@ -270,18 +274,18 @@ msgstr "Info" -#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:109 +#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:169 msgid "Create new relation" msgstr "Neue Relation erstellen" -#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:110 +#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:170 msgid "Edit new relation" msgstr "Neue Relation bearbeiten" -#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:111 +#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:171 #, java-format msgid "Edit relation #{0}" msgstr "Relation bearbeiten #{0}" -#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:152 +#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:212 msgid "" "This is the basic relation editor which allows you to change the relation's " @@ -295,5 +299,5 @@ "Auswahlmöglichkeiten entsprechend anpaßt." -#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:163 +#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:223 #: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:149 #: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:449 @@ -302,5 +306,5 @@ msgstr "Schlüssel" -#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:163 +#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:223 #: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:178 #: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:449 @@ -309,38 +313,38 @@ msgstr "Wert" -#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:186 +#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:247 #: ../../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:479 msgid "Role" msgstr "Rolle" -#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:186 +#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:247 msgid "Occupied By" msgstr "Belegt durch" -#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:215 +#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:282 msgid "Tags (empty value deletes tag)" msgstr "Tags (leerer Wert löscht das Tag)" -#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:217 +#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:284 msgid "Members" msgstr "Mitglieder" -#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:222 +#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:289 msgid "Add Selected" msgstr "Hinzufügen der Auswahl" -#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:222 +#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:289 msgid "Add all currently selected objects as members" msgstr "Füge alle gewählten Objekte als Mitglieder hinzu" -#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:228 +#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:295 msgid "Delete Selected" msgstr "Entfernen der Auswahl" -#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:228 +#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:295 msgid "Delete all currently selected objects from releation" msgstr "Entferne alle gewählten Objekte von der Relation" -#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:234 +#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:301 #: ../../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:63 #: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:94 @@ -357,36 +361,36 @@ msgstr "Löschen" -#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:234 +#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:301 msgid "Remove the member in the current table row from this relation" msgstr "Entferne das Mitglied in der aktuellen Tabellenzeile von dieser Relation." -#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:247 +#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:314 msgid "Highlight the member from the current table row as JOSM's selection" msgstr "Übernehme das Mitglied der aktuellen Tabellenzeile als Auswahl in JOSM." -#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:255 +#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:322 msgid "Download Members" msgstr "Elemente herunterladen" -#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:255 +#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:322 msgid "Download all incomplete ways and nodes in relation" msgstr "Herunterladen aller nicht vollständigen Wege und Knoten der Relation" -#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:288 +#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:355 #, java-format msgid "Members: {0}" msgstr "Mitglieder: {0}" -#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:369 -#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:208 +#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:436 +#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:209 msgid "There were conflicts during import." msgstr "Es gab Konflikte beim Importieren." -#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:377 +#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:444 msgid "Error parsing server response." msgstr "Fehler beim Parsen der Serverantwort." -#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:377 -#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380 +#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:444 +#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:447 #: ../../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:134 #: ../surveyor/src/at/dallermassl/josm/plugin/surveyor/AutoSaveGpsLayerTimerTask.java:86 @@ -397,5 +401,5 @@ msgstr "Fehler" -#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:380 +#: ../../core/src/org/openstreetmap/josm/gui/dialogs/RelationEditor.java:447 msgid "Cannot connect to server." msgstr "Kann nicht mit Server verbinden." @@ -789,5 +793,5 @@ #: ../../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84 #: ../../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:742 -#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:397 +#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:398 #, java-format msgid "Converted from: {0}" @@ -996,7 +1000,20 @@ "der GPS-Spur entfernt waren, wurden übersprungen." -#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:184 +#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:159 +#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157 +#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:94 +#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:372 +msgid "inactive" +msgstr "Inaktiv" + +#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:160 +msgid "downloaded Area" +msgstr "Heruntergeladener Bereich" + +#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:185 #: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:148 +#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:96 #: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47 +#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:374 #: ../../core/src/org/openstreetmap/josm/command/RotateCommand.java:135 #: ../../core/src/org/openstreetmap/josm/command/MoveCommand.java:122 @@ -1006,7 +1023,9 @@ msgstr[1] "Knotenpunkte" -#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:185 +#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:186 #: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:150 +#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:97 #: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:59 +#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:375 msgid "way" msgid_plural "ways" @@ -1014,15 +1033,15 @@ msgstr[1] "Wege" -#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:306 +#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:307 #, java-format msgid "{0} consists of:" msgstr "{0} besteht aus:" -#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:310 +#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:311 #, java-format msgid " ({0} deleted.)" msgstr " ({0} gelöscht.)" -#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:394 +#: ../../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:395 msgid "Convert to GPX layer" msgstr "Zur GPX-Ebene konvertieren" @@ -1909,4 +1928,6 @@ #: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:147 +#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:101 +#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:377 msgid "background" msgstr "Hintergrund" @@ -1917,9 +1938,12 @@ #: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:151 +#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:100 +#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:376 msgid "incomplete way" -msgstr "unvollständiger Weg" +msgstr "Unvollständiger Weg" #: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:152 #: ../../core/src/org/openstreetmap/josm/data/osm/Relation.java:83 +#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:98 #: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69 msgid "relation" @@ -1929,6 +1953,8 @@ #: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:153 +#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:95 +#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:373 msgid "selected" -msgstr "gewählt" +msgstr "Ausgewählt" #: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:154 @@ -1944,8 +1970,4 @@ msgid "scale" msgstr "Skala" - -#: ../../core/src/org/openstreetmap/josm/gui/preferences/ColorPreference.java:157 -msgid "inactive" -msgstr "Inaktiv" #: ../../core/src/org/openstreetmap/josm/gui/preferences/TaggingPresetPreference.java:42 @@ -2207,8 +2229,20 @@ msgstr[1] " {0} Knotenpunkte" +#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99 +msgid "untagged way" +msgstr "Weg ohne Schlüssel" + #: ../../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79 #, java-format msgid " [id: {0}]" msgstr " [ID: {0}]" + +#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:378 +msgid "untagged" +msgstr "Ohne Schlüssel" + +#: ../../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:379 +msgid "text" +msgstr "Text" #: ../../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15 @@ -3613,5 +3647,8 @@ "The maximum bbox size is 0.25, and your request was too large. Either " "request a smaller area, or use planet.osm" -msgstr "Die maximale Downloadgröße ist 0.25 Grad und Ihre Anfrage war zu groß. Entweder Sie fordern ein kleineres Gebiet an, oder nutzen die Datei planet.osm." +msgstr "" +"Die maximale Downloadgröße ist 0.25 Grad und Ihre Anfrage war zu groß. " +"Entweder Sie fordern ein kleineres Gebiet an, oder nutzen die Datei planet." +"osm." #: ../lang/validator.java:38 @@ -7448,15 +7485,27 @@ msgstr "Fehler beim Initialisieren von Test {0}: \"{1}\"" -#: ../validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:12 +#: ../validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:13 msgid "Errors" msgstr "Fehler" -#: ../validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:14 +#: ../validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:13 +msgid "validation error" +msgstr "Datenprüfung: Fehler" + +#: ../validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:15 msgid "Warnings" msgstr "Warnungen" -#: ../validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:16 +#: ../validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:15 +msgid "validation warning" +msgstr "Datenprüfung: Warnung" + +#: ../validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:17 msgid "Other" msgstr "Andere" + +#: ../validator/src/org/openstreetmap/josm/plugins/validator/Severity.java:17 +msgid "validation other" +msgstr "Datenprüfung: Andere" #: ../validator/src/org/openstreetmap/josm/plugins/validator/ErrorLayer.java:36 Index: /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java =================================================================== --- /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java (revision 9883) +++ /applications/editors/josm/plugins/validator/src/org/openstreetmap/josm/plugins/validator/Severity.java (revision 9884) @@ -1,4 +1,5 @@ package org.openstreetmap.josm.plugins.validator; +import static org.openstreetmap.josm.tools.I18n.marktr; import static org.openstreetmap.josm.tools.I18n.tr; @@ -10,9 +11,9 @@ public enum Severity { /** Error messages */ - ERROR(tr("Errors"), "error.gif", Preferences.getPreferencesColor("validation error", Color.RED)), + ERROR(tr("Errors"), "error.gif", Preferences.getPreferencesColor(marktr("validation error"), Color.RED)), /** Warning messages */ - WARNING(tr("Warnings"), "warning.gif", Preferences.getPreferencesColor("validation warning", Color.YELLOW)), + WARNING(tr("Warnings"), "warning.gif", Preferences.getPreferencesColor(marktr("validation warning"), Color.YELLOW)), /** Other messages */ - OTHER(tr("Other"), "other.gif", Preferences.getPreferencesColor("validation other", Color.CYAN)); + OTHER(tr("Other"), "other.gif", Preferences.getPreferencesColor(marktr("validation other"), Color.CYAN)); /** Description of the severity code */