Index: /CONTRIBUTION =================================================================== --- /CONTRIBUTION (revision 164) +++ /CONTRIBUTION (revision 165) @@ -15,12 +15,12 @@ The jar-file is licensed under LGPL. -An internationalization-patch was submited 2006 by Sven -Anders . - Several smaller patches are contributed by community members of OSM. +Some plugins are from Nick Whitelegg (currently mappaint and +landsat). + Internalisation: -German (not finished): Sven Anders +German: Sven Anders French: Frédéric Bonifas Romanian: Ovidiu Constantin Index: /README =================================================================== --- /README (revision 164) +++ /README (revision 165) @@ -7,5 +7,5 @@ To run JOSM, you need: -* The jar file (e.g. josm-latest.jar) +* The jar file (e.g. josm.jar) * The latest Java Runtime Environment 1.5. Index: /po/keys.pot =================================================================== --- /po/keys.pot (revision 164) +++ /po/keys.pot (revision 165) @@ -9,5 +9,5 @@ "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-10-07 17:02+0200\n" +"POT-Creation-Date: 2006-10-13 22:43+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" @@ -18,109 +18,109 @@ "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:52 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:52 msgid "Add segment" msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:54 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:54 msgid "Add a segment between two nodes." msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:56 -#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:57 -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322 -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:391 -#: src/org/openstreetmap/josm/command/DeleteCommand.java:46 -#: src/org/openstreetmap/josm/command/DeleteCommand.java:58 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:56 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:59 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:370 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:46 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:58 msgid "Delete" msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:58 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:58 msgid "Delete nodes, streets or segments." msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:152 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:152 msgid "Cannot delete node." msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:156 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:156 msgid "This object is in use." msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:173 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:173 msgid "Used by more than two segments." msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:178 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:178 msgid "Used by only one segment." msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:187 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:187 msgid "Wrong direction of segments." msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190 msgid "Conflicting keys" msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:196 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:196 msgid "Segments are part of different ways." msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:214 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:214 msgid "Delete Node" msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom" msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom in by dragging. (Ctrl+up,left,down,right,+,-)" msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:72 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73 msgid "Selection" msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:72 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73 msgid "Select objects by dragging or clicking." msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74 msgid "Straight line" msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74 msgid "Select objects in a straight line." msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:52 -#: src/org/openstreetmap/josm/command/MoveCommand.java:122 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:52 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/command/MoveCommand.java:122 msgid "Move" msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:54 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:54 msgid "Move around objects that are under the mouse or selected." msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:102 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:102 msgid "Cannot move objects outside of the world." msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61 msgid "Add Way" msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61 msgid "Add a new way to the data." msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:95 -#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:143 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:95 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:143 msgid "" "Warning: This way is incomplete. Try to download it, before adding segments." msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162 #, java-format msgid "" @@ -133,25 +133,25 @@ msgstr[1] "" -#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162 msgid "Add segments from ways" msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168 msgid "Do you want to add all other selected segments to the one selected way?" msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168 msgid "Add segments to way?" msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173 msgid "Reorder all line segments?" msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173 msgid "Reorder?" msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232 #, java-format msgid "Create a new way out of {0} segment?" @@ -160,98 +160,98 @@ msgstr[1] "" -#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232 msgid "Create new way" msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:46 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47 msgid "Add node" msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:46 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47 msgid "Add a new node to the map" msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48 msgid "Add node into segment" msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48 msgid "Add a node into an existing segment" msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:83 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:85 msgid "Can not add a node outside of the world." msgstr "" -#: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:132 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:134 msgid "Add Node into Segment" msgstr "" -#: src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26 -#: src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:53 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:53 msgid "Reverse Segments" msgstr "" -#: src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26 msgid "Revert the direction of all selected Segments." msgstr "" -#: src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:39 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:39 msgid "Please select at least one segment." msgstr "" -#: src/org/openstreetmap/josm/actions/PreferencesAction.java:21 -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:217 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:209 msgid "Preferences" msgstr "" -#: src/org/openstreetmap/josm/actions/PreferencesAction.java:21 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21 msgid "Open a preferences page for global settings." msgstr "" -#: src/org/openstreetmap/josm/actions/OpenAction.java:40 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40 msgid "Open" msgstr "" -#: src/org/openstreetmap/josm/actions/OpenAction.java:40 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40 msgid "Open a file." msgstr "" -#: src/org/openstreetmap/josm/actions/OpenAction.java:73 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:73 msgid "CSV Data import for non-GPS data is not implemented yet." msgstr "" -#: src/org/openstreetmap/josm/actions/OpenAction.java:76 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:76 #, java-format msgid "Unknown file extension: {0}" msgstr "" -#: src/org/openstreetmap/josm/actions/OpenAction.java:83 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:83 #, java-format msgid "Error while parsing {0}" msgstr "" -#: src/org/openstreetmap/josm/actions/OpenAction.java:86 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/OpenAction.java:86 #, java-format msgid "Could not read \"{0}\"" msgstr "" -#: src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23 msgid "Undo" msgstr "" -#: src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23 msgid "Undo the last action." msgstr "" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:87 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:87 msgid "Download from OSM" msgstr "" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:87 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:87 msgid "Download map data from the OSM server." msgstr "" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:102 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:102 msgid "" "Move and zoom the image like the main map. Select an area to download by " @@ -259,152 +259,152 @@ msgstr "" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:105 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:105 msgid "Bounding box" msgstr "" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:106 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:106 msgid "min lat" msgstr "" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:108 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:108 msgid "min lon" msgstr "" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:110 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:110 msgid "max lat" msgstr "" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:112 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:112 msgid "max lon" msgstr "" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:122 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:122 msgid "Download the following data:" msgstr "" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:129 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:129 msgid "URL from www.openstreetmap.org" msgstr "" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:182 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:182 msgid "Bookmarks" msgstr "" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:198 -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:320 -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:365 -#: src/org/openstreetmap/josm/command/AddCommand.java:52 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:198 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:320 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:344 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/command/AddCommand.java:52 msgid "Add" msgstr "" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:203 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:203 msgid "Please enter the desired coordinates first." msgstr "" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:206 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:206 msgid "Please enter a name for the location." msgstr "" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:214 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:214 msgid "Remove" msgstr "" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:219 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:219 msgid "Select a bookmark first." msgstr "" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:238 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:238 msgid "Choose an area" msgstr "" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:261 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:261 msgid "Please enter the desired coordinates or click on a bookmark." msgstr "" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:263 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:263 msgid "Please select at least one download data type." msgstr "" -#: src/org/openstreetmap/josm/actions/ExitAction.java:18 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18 msgid "Exit" msgstr "" -#: src/org/openstreetmap/josm/actions/ExitAction.java:18 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18 msgid "Exit the application." msgstr "" -#: src/org/openstreetmap/josm/actions/AboutAction.java:57 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57 msgid "About" msgstr "" -#: src/org/openstreetmap/josm/actions/AboutAction.java:57 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57 msgid "Display the about screen." msgstr "" -#: src/org/openstreetmap/josm/actions/AboutAction.java:67 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:67 #, java-format msgid "Java OpenStreetMap Editor Version {0}" msgstr "" -#: src/org/openstreetmap/josm/actions/AboutAction.java:68 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:68 #, java-format msgid "last change at {0}" msgstr "" -#: src/org/openstreetmap/josm/actions/AboutAction.java:69 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:69 #, java-format msgid "Java Version {0}" msgstr "" -#: src/org/openstreetmap/josm/actions/AboutAction.java:70 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:70 msgid "Homepage" msgstr "" -#: src/org/openstreetmap/josm/actions/AboutAction.java:72 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:72 msgid "Bug Reports" msgstr "" -#: src/org/openstreetmap/josm/actions/AboutAction.java:74 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:74 msgid "News about JOSM" msgstr "" -#: src/org/openstreetmap/josm/actions/AboutAction.java:78 -#: src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:78 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25 msgid "Info" msgstr "" -#: src/org/openstreetmap/josm/actions/AboutAction.java:79 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:79 msgid "Readme" msgstr "" -#: src/org/openstreetmap/josm/actions/AboutAction.java:80 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:80 msgid "Revision" msgstr "" -#: src/org/openstreetmap/josm/actions/AboutAction.java:81 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:81 msgid "Contribution" msgstr "" -#: src/org/openstreetmap/josm/actions/AboutAction.java:85 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:85 msgid "About JOSM..." msgstr "" -#: src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AboutAction.java:95 msgid "File could not be found." msgstr "" -#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:25 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:25 msgid "No document open so nothing to save." msgstr "" -#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:28 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:28 msgid "The document contains no data. Save anyway?" msgstr "" -#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:28 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:28 msgid "Empty document" msgstr "" -#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:32 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:32 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -412,104 +412,104 @@ msgstr "" -#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:32 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:32 msgid "Conflicts" msgstr "" -#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:79 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:79 msgid "File exists. Overwrite?" msgstr "" -#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:79 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:79 msgid "Overwrite" msgstr "" -#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "data" msgstr "" -#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 msgid "selection" msgstr "" -#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:31 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31 msgid "layer" msgstr "" -#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 -#: src/org/openstreetmap/josm/data/Preferences.java:141 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:141 msgid "conflict" msgstr "" -#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:40 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:40 #, java-format msgid "Auto Scale: {0}" msgstr "" -#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:41 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:43 #, java-format msgid "Auto zoom the view (to {0}. Disabled if the view is moved)" msgstr "" -#: src/org/openstreetmap/josm/actions/UploadAction.java:36 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25 +msgid "OSM Server Files (.osm .xml)" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 +msgid "GPX Files (.gpx)" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 +msgid "CSV Files (.csv .txt)" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36 msgid "Upload to OSM" msgstr "" -#: src/org/openstreetmap/josm/actions/UploadAction.java:36 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36 msgid "Upload all changes to the OSM server." msgstr "" -#: src/org/openstreetmap/josm/actions/UploadAction.java:41 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:41 msgid "Nothing to upload. Get some data first." msgstr "" -#: src/org/openstreetmap/josm/actions/UploadAction.java:46 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:46 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "" -#: src/org/openstreetmap/josm/actions/UploadAction.java:75 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:75 msgid "Uploading data" msgstr "" -#: src/org/openstreetmap/josm/actions/UploadAction.java:97 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:97 msgid "No changes to upload." msgstr "" -#: src/org/openstreetmap/josm/actions/UploadAction.java:106 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:106 msgid "Objects to add:" msgstr "" -#: src/org/openstreetmap/josm/actions/UploadAction.java:114 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:114 msgid "Objects to modify:" msgstr "" -#: src/org/openstreetmap/josm/actions/UploadAction.java:122 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:122 msgid "Objects to delete:" msgstr "" -#: src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/UploadAction.java:129 msgid "Upload this changes?" msgstr "" -#: src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25 -msgid "OSM Server Files (.osm .xml)" -msgstr "" - -#: src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 -msgid "GPX Files (.gpx)" -msgstr "" - -#: src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 -msgid "CSV Files (.csv .txt)" -msgstr "" - -#: src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23 msgid "Redo" msgstr "" -#: src/org/openstreetmap/josm/actions/RedoAction.java:23 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23 msgid "Redo the last undone action." msgstr "" -#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:46 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:39 #, java-format msgid "Downloading {0} segment" @@ -518,53 +518,83 @@ msgstr[1] "" -#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:58 -#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:39 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:57 +msgid "Download incomplete objects" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:57 +msgid "Download all (selected) incomplete ways from the OSM server." +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:66 +msgid "Please select an incomplete way." +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69 +#, java-format +msgid "Download {0} incomplete ways?" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69 +msgid "Download?" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:28 +msgid "Save as" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:28 +msgid "Save the current data to a new file." +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:23 +msgid "Raw GPS data" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:26 +msgid "Downloading GPS data" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:25 +msgid "OpenStreetMap data" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:28 +msgid "Downloading data" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:39 msgid "No data imported." msgstr "" -#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:62 -#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:40 -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:76 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:40 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:76 msgid "Data Layer" msgstr "" -#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:82 -msgid "Download incomplete objects" -msgstr "" - -#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:82 -msgid "Download all (selected) incomplete ways from the OSM server." -msgstr "" - -#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:100 -#, java-format -msgid "Download {0} ways containing a total of {1} segments?" -msgstr "" - -#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:100 -msgid "Download?" -msgstr "" - -#: src/org/openstreetmap/josm/actions/SaveAction.java:31 -msgid "Save" -msgstr "" - -#: src/org/openstreetmap/josm/actions/SaveAction.java:31 -msgid "Save the current data." -msgstr "" - -#: src/org/openstreetmap/josm/actions/SaveAction.java:58 -msgid "CSV output not supported yet." -msgstr "" - -#: src/org/openstreetmap/josm/actions/SaveAction.java:61 -msgid "Unknown file extension." -msgstr "" - -#: src/org/openstreetmap/josm/actions/SaveAction.java:67 -msgid "An error occoured while saving." -msgstr "" - -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:40 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:71 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:287 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:302 +#, java-format +msgid "Executing {0}" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:146 +msgid "The Tool requires some data to be loaded." +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:306 +#, java-format +msgid "Could not execute command: {0}" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:317 +msgid "Tools" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:352 +msgid "Could not read external tool configuration." +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:40 msgid "" "Note: GPL is not compatible to the OSM license. Do not upload GPL licensed " @@ -572,141 +602,122 @@ msgstr "" -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:45 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:45 msgid "Export to GPX" msgstr "" -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:45 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:45 msgid "Export the data to GPX file." msgstr "" -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:51 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:51 msgid "Nothing to export. Get some data first." msgstr "" -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 msgid "gps track description" msgstr "" -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:81 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:81 msgid "Add author information" msgstr "" -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:84 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:84 msgid "Real name" msgstr "" -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 msgid "Email" msgstr "" -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 msgid "Copyright (URL)" msgstr "" -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 msgid "Predefined" msgstr "" -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:98 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:98 msgid "Copyright year" msgstr "" -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:106 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:106 msgid "Keywords" msgstr "" -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:110 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:110 msgid "Export options" msgstr "" -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:131 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:131 #, java-format msgid "Error while exporting {0}" msgstr "" -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:131 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:131 msgid "Error" msgstr "" -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:185 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:185 msgid "Choose a predefined license" msgstr "" -#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:25 -msgid "OpenStreetMap data" -msgstr "" - -#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:28 -msgid "Downloading data" -msgstr "" - -#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:23 -msgid "Raw GPS data" -msgstr "" - -#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:26 -msgid "Downloading GPS data" -msgstr "" - -#: src/org/openstreetmap/josm/actions/ExternalToolsAction.java:71 -#: src/org/openstreetmap/josm/actions/ExternalToolsAction.java:287 -#: src/org/openstreetmap/josm/actions/ExternalToolsAction.java:302 -#, java-format -msgid "Executing {0}" -msgstr "" - -#: src/org/openstreetmap/josm/actions/ExternalToolsAction.java:146 -msgid "The Tool requires some data to be loaded." -msgstr "" - -#: src/org/openstreetmap/josm/actions/ExternalToolsAction.java:306 -#, java-format -msgid "Could not execute command: {0}" -msgstr "" - -#: src/org/openstreetmap/josm/actions/ExternalToolsAction.java:317 -msgid "Tools" -msgstr "" - -#: src/org/openstreetmap/josm/actions/ExternalToolsAction.java:352 -msgid "Could not read external tool configuration." -msgstr "" - -#: src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29 -#: src/org/openstreetmap/josm/actions/AlignInCircleAction.java:69 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:69 msgid "Align Nodes in Circle" msgstr "" -#: src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29 msgid "Move the selected nodes into a circle." msgstr "" -#: src/org/openstreetmap/josm/actions/AlignInCircleAction.java:39 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:39 msgid "Please select at least four nodes." msgstr "" -#: src/org/openstreetmap/josm/actions/RenameLayerAction.java:35 -#: src/org/openstreetmap/josm/actions/RenameLayerAction.java:56 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:35 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:56 msgid "Rename layer" msgstr "" -#: src/org/openstreetmap/josm/actions/RenameLayerAction.java:44 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:44 msgid "Also rename the file" msgstr "" -#: src/org/openstreetmap/josm/actions/RenameLayerAction.java:80 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:80 #, java-format msgid "Could not rename the file \"{0}\"." msgstr "" -#: src/org/openstreetmap/josm/actions/SaveAsAction.java:28 -msgid "Save as" -msgstr "" - -#: src/org/openstreetmap/josm/actions/SaveAsAction.java:28 -msgid "Save the current data to a new file." -msgstr "" - -#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/HelpAction.java:52 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainMenu.java:55 +msgid "Help" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/HelpAction.java:104 +msgid "Can only edit help pages from JOSM Online Help" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:31 +msgid "Save" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:31 +msgid "Save the current data." +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:58 +msgid "CSV output not supported yet." +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:61 +msgid "Unknown file extension." +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/actions/SaveAction.java:67 +msgid "An error occoured while saving." +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #, java-format msgid "" @@ -716,13 +727,13 @@ msgstr "" -#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Do nothing" msgstr "" -#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Report Bug" msgstr "" -#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 msgid "" "An unexpected exception occoured.\n" @@ -732,9 +743,9 @@ msgstr "" -#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Unexpected Exception" msgstr "" -#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:62 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:62 msgid "" "Please send this to josm@eigenheimstrasse.de\n" @@ -742,5 +753,5 @@ msgstr "" -#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:83 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:83 msgid "" "Please send an email with the following information to josm@eigenheimstrasse." @@ -748,85 +759,56 @@ msgstr "" -#: src/org/openstreetmap/josm/tools/ShortCutLabel.java:12 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:12 msgid "Ctrl-" msgstr "" -#: src/org/openstreetmap/josm/tools/ShortCutLabel.java:14 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:14 msgid "Alt-" msgstr "" -#: src/org/openstreetmap/josm/tools/ShortCutLabel.java:16 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:16 msgid "AltGr-" msgstr "" -#: src/org/openstreetmap/josm/tools/ShortCutLabel.java:18 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:18 msgid "Shift-" msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:63 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:63 msgid "Load Selection" msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:70 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:70 #, java-format msgid "Contact {0}..." msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:75 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:75 msgid "Downloading..." msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #, java-format msgid "Could not read from url: \"{0}\"" msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:90 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:90 #, java-format msgid "Parsing error in url: \"{0}\"" msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113 msgid "Current Selection" msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113 msgid "Open a selection list window." msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:128 -#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 -msgid "Select" -msgstr "" - -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:129 -#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 -msgid "" -"Set the selected elements on the map to the selected items in the list above." -msgstr "" - -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137 -#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83 -msgid "Reload" -msgstr "" - -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 -msgid "Refresh the selection list." -msgstr "" - -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:146 -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:180 -msgid "Search" -msgstr "" - -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 -msgid "Search for objects." -msgstr "" - -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:143 msgid "Please enter a search string." msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 msgid "" "Fulltext search.
  • Baker Street - 'Baker' and " @@ -837,86 +819,143 @@ msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:161 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 msgid "replace selection" msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:162 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:154 msgid "add to selection" msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:163 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:155 msgid "remove from selection" msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:172 +msgid "Search" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51 msgid "Conflict" msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51 msgid "Merging conflicts." msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 msgid "Resolve" msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Open a merge dialog of all selected items in the list above." msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:106 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 +msgid "Select" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:74 +msgid "" +"Set the selected elements on the map to the selected items in the list above." +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:108 msgid "Please select something from the conflict list." msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117 msgid "Resolve Conflicts" msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:82 +msgid "Click Reload to refresh list" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83 +msgid "Reload" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:84 +msgid "Revert" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87 +msgid "History" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87 +msgid "Display the history of all selected items." +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MapStatus.java:225 +msgid "Object" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96 +msgid "Date" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 +msgid "Reload all currently selected objects and refresh the list." +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:180 +msgid "Not implemented yet." +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:138 +msgid "" +"Revert the state of all currently selected objects to the version selected " +"in the history list." +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 msgid "Command Stack" msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 msgid "Open a list of all commands (undo buffer)." msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:58 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:60 msgid "Delete the selected layer." msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:79 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 msgid "Show/Hide" msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:80 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:83 msgid "Toggle visible state of the selected layer." msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:118 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:122 msgid "Layers" msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:118 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:122 msgid "Open a list of all loaded layers." msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:190 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:196 msgid "Move the selected layer one row up." msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:195 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:202 msgid "Move the selected layer one row down." msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:208 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:216 msgid "Merge the selected layer into the layer directly below." msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:99 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:99 msgid "Please select the objects you want to change properties for." msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102 -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 #, java-format msgid "This will change {0} object." @@ -925,5 +964,5 @@ msgstr[1] "" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102 #, java-format msgid "" @@ -931,46 +970,46 @@ msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:114 -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:178 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:114 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:178 msgid "Change values?" msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:132 -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:284 -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:368 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:132 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:284 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:369 msgid "" msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151 msgid "Please select objects for which you want to change properties." msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 msgid "Please select a key" msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 msgid "Please select a value" msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222 msgid "Properties" msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222 msgid "Property for selected objects." msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 #, java-format msgid "Could not read annotation preset source: {0}" msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:244 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:244 #, java-format msgid "Error parsing {0}: " msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:263 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:263 #, java-format msgid "Change {0} object" @@ -979,86 +1018,78 @@ msgstr[1] "" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276 -#: src/org/openstreetmap/josm/gui/ConflictResolver.java:81 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81 msgid "Key" msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276 -#: src/org/openstreetmap/josm/gui/ConflictResolver.java:81 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81 msgid "Value" msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:309 -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:380 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:309 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:359 msgid "Please select the row to edit." msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:314 -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:395 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:314 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374 msgid "Please select the row to delete." msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:320 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:320 msgid "Add a new key/value pair to all objects" msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321 -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:376 -#: src/org/openstreetmap/josm/Main.java:218 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:355 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainMenu.java:53 msgid "Edit" msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321 msgid "Edit the value of the selected key for all objects" msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322 msgid "Delete the selected key in all objects" msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:82 -msgid "Click Reload to refresh list" -msgstr "" - -#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:84 -msgid "Revert" -msgstr "" - -#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87 -msgid "History" -msgstr "" - -#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87 -msgid "Display the history of all selected items." -msgstr "" - -#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96 -#: src/org/openstreetmap/josm/gui/MapStatus.java:224 -msgid "Object" -msgstr "" - -#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96 -msgid "Date" -msgstr "" - -#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 -msgid "Reload all currently selected objects and refresh the list." -msgstr "" - -#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:134 -#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:178 -msgid "Not implemented yet." -msgstr "" - -#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:137 -msgid "" -"Revert the state of all currently selected objects to the version selected " -"in the history list." -msgstr "" - -#: src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:161 -#: src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:66 -#: src/org/openstreetmap/josm/data/Preferences.java:135 -#: src/org/openstreetmap/josm/command/MoveCommand.java:122 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:160 +#, java-format +msgid "Unknown type at line {0}" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:178 +#, java-format +msgid "Cannot have a writable combobox with default values (line {0})" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:183 +#, java-format +msgid "" +"display_values ({0}) and values ({1}) must be of same number of elements." +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:184 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:185 +msgid "element" +msgid_plural "elements" +msgstr[0] "" +msgstr[1] "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:190 +#, java-format +msgid "Unknown annotation object {0} at line {1} column {2}" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:258 +msgid "Change Properties" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:161 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:66 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:135 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/command/MoveCommand.java:122 msgid "node" msgid_plural "nodes" @@ -1066,7 +1097,7 @@ msgstr[1] "" -#: src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162 -#: src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:53 -#: src/org/openstreetmap/josm/data/Preferences.java:136 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:53 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:136 msgid "segment" msgid_plural "segments" @@ -1074,7 +1105,7 @@ msgstr[1] "" -#: src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:163 -#: src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:92 -#: src/org/openstreetmap/josm/data/Preferences.java:137 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:163 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:92 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:137 msgid "way" msgid_plural "ways" @@ -1082,23 +1113,23 @@ msgstr[1] "" -#: src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "There were conflicts during import." msgstr "" -#: src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 #, java-format msgid "{0} consists of:" msgstr "" -#: src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:321 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:321 #, java-format msgid " ({0} deleted.)" msgstr "" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:57 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:57 msgid "Convert to data layer" msgstr "" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159 msgid "track" msgid_plural "tracks" @@ -1106,5 +1137,5 @@ msgstr[1] "" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 msgid "point" msgid_plural "points" @@ -1112,5 +1143,5 @@ msgstr[1] "" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, java-format msgid "a track with {0} point" @@ -1119,5 +1150,5 @@ msgstr[1] "" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} consists of {1} track" @@ -1126,5 +1157,5 @@ msgstr[1] "" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, java-format msgid "{0} point" @@ -1133,106 +1164,106 @@ msgstr[1] "" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 msgid "Customize line drawing" msgstr "" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 msgid "Use global settings." msgstr "" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 msgid "Draw lines between points for this layer." msgstr "" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 msgid "Do not draw lines between points for this layer." msgstr "" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:211 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:211 msgid "Select line drawing options" msgstr "" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:222 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:222 msgid "Customize Color" msgstr "" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227 msgid "OK" msgstr "" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227 -#: src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:25 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:24 msgid "Cancel" msgstr "" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227 msgid "Default" msgstr "" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:228 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:228 msgid "Choose a color" msgstr "" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 msgid "Import images" msgstr "" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:255 -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:349 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:255 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:349 msgid "JPEG images (*.jpg)" msgstr "" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:90 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:90 #, java-format msgid "Images for {0}" msgstr "" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95 msgid "Read GPS..." msgstr "" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:102 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:102 #, java-format msgid "No time for point {0} x {1}" msgstr "" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:107 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:107 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:114 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:114 msgid "No images with readable timestamps found." msgstr "" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125 #, java-format msgid "Reading {0}..." msgstr "" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:191 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:191 msgid "Geotagged Images" msgstr "" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:269 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:269 #, java-format msgid "GPS start: {0}" msgstr "" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:270 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:270 #, java-format msgid "GPS end: {0}" msgstr "" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:272 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:272 #, java-format msgid "current delta: {0}s" msgstr "" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:273 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:273 msgid "timezone difference: " msgstr "" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 msgid "image" msgid_plural "images" @@ -1240,130 +1271,130 @@ msgstr[1] "" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 #, java-format msgid "{0} within the track." msgstr "" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338 msgid "Sync clock" msgstr "" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:399 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:399 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 msgid "Image" msgstr "" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:405 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:405 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:408 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:408 msgid "GPS unit timezome (difference to photo)" msgstr "" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 msgid "Syncronize Time with GPS Unit" msgstr "" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:432 -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:434 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:432 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:434 msgid "Time entered could not be parsed." msgstr "" -#: src/org/openstreetmap/josm/gui/BookmarkList.java:74 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:74 msgid "Could not read bookmarks." msgstr "" -#: src/org/openstreetmap/josm/gui/BookmarkList.java:98 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:98 msgid "Could not write bookmark." msgstr "" -#: src/org/openstreetmap/josm/gui/MapView.java:123 -#: src/org/openstreetmap/josm/gui/MainApplication.java:172 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MapView.java:123 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:171 msgid "Java Open Street Map - Editor" msgstr "" -#: src/org/openstreetmap/josm/gui/MapView.java:163 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MapView.java:163 msgid "layer not in list." msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplication.java:53 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:55 msgid "Hint: Some changes came from uploading new data to the server." msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplication.java:55 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:57 msgid "There are unsaved changes. Really quit?" msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplication.java:56 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:58 msgid "Unsaved Changes" msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:144 msgid "Java OpenStreetMap Editor" msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:145 msgid "usage" msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:147 msgid "options" msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Show this help" msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:149 msgid "Standard unix geometry argument" msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplication.java:151 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:150 msgid "Download the bounding box" msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplication.java:152 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:151 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplication.java:153 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:152 msgid "Open file (as raw gps, if .gpx or .csv)" msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplication.java:154 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:153 msgid "Download the bounding box as raw gps" msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplication.java:155 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Select with the given search" msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:155 msgid "Don't launch in fullscreen mode" msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplication.java:157 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:156 msgid "Reset the preferences to default" msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Set the language. Example: " msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:158 msgid "examples" msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:164 msgid "" "Parameters are read in the order they are specified, so make sure you load\n" @@ -1371,13 +1402,13 @@ msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplication.java:167 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:166 msgid "Instead of --download= you may specify osm://\n" msgstr "" -#: src/org/openstreetmap/josm/gui/MapStatus.java:222 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MapStatus.java:223 msgid "Lat/Lon" msgstr "" -#: src/org/openstreetmap/josm/gui/ConflictResolver.java:232 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:232 #, java-format msgid "{0} object has conflicts:" @@ -1386,49 +1417,49 @@ msgstr[1] "" -#: src/org/openstreetmap/josm/gui/ConflictResolver.java:235 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:235 msgid "my version:" msgstr "" -#: src/org/openstreetmap/josm/gui/ConflictResolver.java:241 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:241 msgid "their version:" msgstr "" -#: src/org/openstreetmap/josm/gui/ConflictResolver.java:247 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:247 msgid "resolved version:" msgstr "" -#: src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:77 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:77 msgid "Error while parsing" msgstr "" -#: src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:80 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:80 msgid "File Not found" msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplet.java:34 -#: src/org/openstreetmap/josm/gui/MainApplet.java:35 -#: src/org/openstreetmap/josm/gui/MainApplet.java:36 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:34 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:35 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:36 msgid "string" msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplet.java:34 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:34 msgid "Name of the user." msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplet.java:35 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:35 msgid "OSM Password." msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplet.java:36 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:36 msgid "Size the applet to the given geometry (format: WIDTHxHEIGHT)" msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplet.java:37 -#: src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: src/org/openstreetmap/josm/gui/MainApplet.java:39 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:37 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "string;string;..." msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplet.java:37 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:37 msgid "" "Download each. Can be x1,y1,x2,y2 an url containing lat=y&lon=x&zoom=z or a " @@ -1436,5 +1467,5 @@ msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:38 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an url containing " @@ -1442,5 +1473,5 @@ msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplet.java:39 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "" "Add each to the initial selection. Can be a google-like search string or an " @@ -1448,99 +1479,99 @@ msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplet.java:40 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40 msgid "any" msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplet.java:40 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40 msgid "If specified, reset the configuration instead of reading it." msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplet.java:65 -#: src/org/openstreetmap/josm/io/OsmConnection.java:68 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:65 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:68 msgid "Username" msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplet.java:68 -#: src/org/openstreetmap/josm/io/OsmConnection.java:71 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplet.java:68 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:71 msgid "Password" msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:125 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:123 msgid "You have to restart JOSM for some settings to take effect." msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:193 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:185 msgid "Draw lines between raw gps points." msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:197 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:189 msgid "Force lines if no segments imported." msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:198 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:190 msgid "Draw large GPS points." msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:199 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:191 msgid "Draw Direction Arrows" msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:273 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:250 msgid "" "Force drawing of lines if the imported data contain no line information." msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:277 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:254 msgid "Draw larger dots for the GPS points." msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:278 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:255 msgid "Draw direction hints for all segments." msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:327 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:306 msgid "Color" msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:328 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:307 msgid "Name" msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:349 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:328 msgid "Choose" msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:353 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:332 msgid "Please select a color." msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:358 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:337 #, java-format msgid "Choose a color for {0}" msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:368 -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:382 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:347 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:361 msgid "Annotation preset source" msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:407 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:386 msgid "The base URL to the OSM server (REST API)" msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:408 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:387 msgid "Login name (email) to the OSM account." msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:409 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:388 msgid "" "Login password to the OSM account. Leave blank to not store any password." msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:410 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:389 msgid "The base URL to the server retrieving WMS background pictures from." msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:411 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:390 msgid "" "Import string specification. lat/lon and time are imported.
    latWARNING: The password is stored in plain text in the preferences file." @@ -1625,144 +1652,125 @@ msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:461 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:437 msgid "CSV import specification (empty: read from first line in data)" msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:466 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:442 msgid "Map Settings" msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:466 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:442 msgid "Settings for the map projection and data interpretation." msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:467 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:443 msgid "Projection method" msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:470 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:446 msgid "Annotation preset sources" msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:486 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:462 msgid "Plugins" msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:486 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:462 msgid "Configure available Plugins." msgstr "" -#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:160 -#, java-format -msgid "Unknown type at line {0}" -msgstr "" - -#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:178 -#, java-format -msgid "Cannot have a writable combobox with default values (line {0})" -msgstr "" - -#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:183 -#, java-format -msgid "" -"display_values ({0}) and values ({1}) must be of same number of elements." -msgstr "" - -#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:184 -#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:185 -msgid "element" -msgid_plural "elements" -msgstr[0] "" -msgstr[1] "" - -#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:190 -#, java-format -msgid "Unknown annotation object {0} at line {1} column {2}" -msgstr "" - -#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:258 -msgid "Change Properties" -msgstr "" - -#: src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:23 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:465 +msgid "Get more plugins" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainMenu.java:52 +msgid "Layer" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainMenu.java:56 +msgid "Files" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/MainMenu.java:57 +msgid "Connection" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:22 msgid "Contacting the OSM server..." msgstr "" -#: src/org/openstreetmap/josm/io/ObjectListDownloader.java:41 -msgid "Conflicts in disjunct objects" -msgstr "" - -#: src/org/openstreetmap/josm/io/ObjectListDownloader.java:59 -#, java-format -msgid "Downloading {0} {1}" -msgstr "" - -#: src/org/openstreetmap/josm/io/ObjectListDownloader.java:66 -msgid "Got more than one object when expecting only one." -msgstr "" - -#: src/org/openstreetmap/josm/io/OsmReader.java:96 -#: src/org/openstreetmap/josm/io/OsmReader.java:98 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/IncompleteDownloader.java:80 +#, java-format +msgid "Data error: Segment {0} is deleted but part of Way {1}" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/IncompleteDownloader.java:115 +#, java-format +msgid "Data error: Node {0} is deleted but part of Segment {1}" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:71 +#, java-format +msgid "Upload {0} {1} ({2})..." +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:185 +msgid "Unknown host" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:101 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:103 msgid "Unknown version" msgstr "" -#: src/org/openstreetmap/josm/io/OsmReader.java:114 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:119 msgid "Found tag on non-way." msgstr "" -#: src/org/openstreetmap/josm/io/OsmReader.java:117 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:122 msgid "Incomplete segment with id=0" msgstr "" -#: src/org/openstreetmap/josm/io/OsmReader.java:126 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:131 msgid "NullPointerException. Possible some missing tags." msgstr "" -#: src/org/openstreetmap/josm/io/OsmReader.java:141 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:146 msgid "Illegal object with id=0" msgstr "" -#: src/org/openstreetmap/josm/io/OsmReader.java:149 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:154 #, java-format msgid "Couldn''t read time format \"{0}\"." msgstr "" -#: src/org/openstreetmap/josm/io/OsmReader.java:164 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:169 #, java-format msgid "Missing required attirbute \"{0}\"." msgstr "" -#: src/org/openstreetmap/josm/io/OsmReader.java:213 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:239 msgid "Preparing data..." msgstr "" -#: src/org/openstreetmap/josm/io/OsmReader.java:222 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmReader.java:249 msgid "Illformed Node id" msgstr "" -#: src/org/openstreetmap/josm/io/OsmServerWriter.java:71 -#, java-format -msgid "Upload {0} {1} ({2})..." -msgstr "" - -#: src/org/openstreetmap/josm/io/OsmServerWriter.java:185 -msgid "Unknown host" -msgstr "" - -#: src/org/openstreetmap/josm/io/RawGpsReader.java:43 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/RawGpsReader.java:43 #, java-format msgid "Data error: lat value \"{0}\" is out of bound." msgstr "" -#: src/org/openstreetmap/josm/io/RawGpsReader.java:45 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/RawGpsReader.java:45 #, java-format msgid "Data error: lon value \"{0}\" is out of bound." msgstr "" -#: src/org/openstreetmap/josm/io/RawCsvReader.java:39 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:39 msgid "Could not detect data format string." msgstr "" -#: src/org/openstreetmap/josm/io/RawCsvReader.java:62 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:62 msgid "" "Format string in data is incomplete or not found. Try setting an manual " @@ -1770,101 +1778,101 @@ msgstr "" -#: src/org/openstreetmap/josm/io/RawCsvReader.java:63 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:63 msgid "" "Format string is incomplete. Need at least 'lat' and 'lon' specification" msgstr "" -#: src/org/openstreetmap/josm/io/RawCsvReader.java:83 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:83 #, java-format msgid "Unknown data type: \"{0}\"." msgstr "" -#: src/org/openstreetmap/josm/io/RawCsvReader.java:83 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:83 msgid "Maybe add an format string in preferences." msgstr "" -#: src/org/openstreetmap/josm/io/RawCsvReader.java:88 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:88 #, java-format msgid "Parsing error in line {0}" msgstr "" -#: src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:67 +msgid "Incorrect password or username." +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:74 +msgid "Warning: The password is transferred unencrypted." +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:78 +msgid "Save user and password (unencrypted)" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:81 +msgid "Enter Password" +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmConnection.java:116 +msgid "Aborting..." +msgstr "" + +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 #, java-format msgid "Downloading points {0} to {1}..." msgstr "" -#: src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:89 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:89 msgid "Downloading OSM data..." msgstr "" -#: src/org/openstreetmap/josm/io/OsmConnection.java:67 -msgid "Incorrect password or username." -msgstr "" - -#: src/org/openstreetmap/josm/io/OsmConnection.java:74 -msgid "Warning: The password is transferred unencrypted." -msgstr "" - -#: src/org/openstreetmap/josm/io/OsmConnection.java:78 -msgid "Save user and password (unencrypted)" -msgstr "" - -#: src/org/openstreetmap/josm/io/OsmConnection.java:81 -msgid "Enter Password" -msgstr "" - -#: src/org/openstreetmap/josm/io/OsmConnection.java:116 -msgid "Aborting..." -msgstr "" - -#: src/org/openstreetmap/josm/io/OsmIdReader.java:34 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/io/OsmIdReader.java:34 msgid "Error during parse." msgstr "" -#: src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19 msgid "position" msgstr "" -#: src/org/openstreetmap/josm/data/conflict/ConflictItem.java:33 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:33 msgid "different" msgstr "" -#: src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14 msgid "deleted" msgstr "" -#: src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18 msgid "true" msgstr "" -#: src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18 msgid "false" msgstr "" -#: src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21 msgid "none" msgstr "" -#: src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25 msgid "segments" msgstr "" -#: src/org/openstreetmap/josm/data/conflict/ToConflict.java:19 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/ToConflict.java:19 msgid "to" msgstr "" -#: src/org/openstreetmap/josm/data/conflict/FromConflict.java:19 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19 msgid "from" msgstr "" -#: src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48 msgid "new" msgstr "" -#: src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48 msgid "unknown" msgstr "" -#: src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:87 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:87 #, java-format msgid "{0} node" @@ -1873,52 +1881,52 @@ msgstr[1] "" -#: src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:89 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:89 msgid "incomplete" msgstr "" -#: src/org/openstreetmap/josm/data/Preferences.java:134 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:134 msgid "background" msgstr "" -#: src/org/openstreetmap/josm/data/Preferences.java:138 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:138 msgid "incomplete way" msgstr "" -#: src/org/openstreetmap/josm/data/Preferences.java:139 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:139 msgid "selected" msgstr "" -#: src/org/openstreetmap/josm/data/Preferences.java:140 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:140 msgid "gps point" msgstr "" -#: src/org/openstreetmap/josm/data/Preferences.java:142 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/data/Preferences.java:142 msgid "scale" msgstr "" -#: src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77 #, java-format msgid "Resolve {0} conflicts in {1} objects" msgstr "" -#: src/org/openstreetmap/josm/command/ChangeCommand.java:37 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/command/ChangeCommand.java:37 msgid "Change" msgstr "" -#: src/org/openstreetmap/josm/command/SequenceCommand.java:51 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/command/SequenceCommand.java:51 msgid "Sequence" msgstr "" -#: src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66 #, java-format msgid "Remove \"{0}\" for" msgstr "" -#: src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66 #, java-format msgid "Set {0}={1} for" msgstr "" -#: src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72 msgid "object" msgid_plural "objects" @@ -1926,57 +1934,33 @@ msgstr[1] "" -#: src/org/openstreetmap/josm/plugins/PluginException.java:17 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/plugins/PluginException.java:17 #, java-format msgid "An error occoured in plugin {0}" msgstr "" -#: src/org/openstreetmap/josm/Main.java:176 -msgid "You have to specify annotation sources in the preferences first." -msgstr "" - -#: src/org/openstreetmap/josm/Main.java:183 -msgid "Annotation Preset Tester" -msgstr "" - -#: src/org/openstreetmap/josm/Main.java:195 -msgid "Files" -msgstr "" - -#: src/org/openstreetmap/josm/Main.java:206 -msgid "Connection" -msgstr "" - -#: src/org/openstreetmap/josm/Main.java:213 -msgid "Layer" -msgstr "" - -#: src/org/openstreetmap/josm/Main.java:234 -msgid "Help" -msgstr "" - -#: src/org/openstreetmap/josm/Main.java:267 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/Main.java:201 #, java-format msgid "Plugin not found: {0}." msgstr "" -#: src/org/openstreetmap/josm/Main.java:270 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/Main.java:204 #, java-format msgid "Could not load plugin {0}." msgstr "" -#: src/org/openstreetmap/josm/Main.java:293 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/Main.java:228 msgid "unnamed" msgstr "" -#: src/org/openstreetmap/josm/Main.java:343 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/Main.java:271 msgid "The projection could not be read from preferences. Using EPSG:4263." msgstr "" -#: src/org/openstreetmap/josm/Main.java:401 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/Main.java:329 #, java-format msgid "Ignoring malformed url: \"{0}\"" msgstr "" -#: src/org/openstreetmap/josm/Main.java:413 +#: /sol/home/imi/src/josm/src/org/openstreetmap/josm/Main.java:341 #, java-format msgid "Ignoring malformed file url: \"{0}\""