Index: utils/josm/plugins/lang-en_GB/build.xml =================================================================== --- utils/josm/plugins/lang-en_GB/build.xml (revision 1467) +++ utils/josm/plugins/lang-en_GB/build.xml (revision 1469) @@ -2,9 +2,16 @@ - + + + + + + + + - + + - @@ -14,17 +21,30 @@ + + - - - + + + + + + + + - + + + + - + + + + - + Index: utils/josm/plugins/lang-en_GB/en_GB.po =================================================================== --- utils/josm/plugins/lang-en_GB/en_GB.po (revision 1467) +++ utils/josm/plugins/lang-en_GB/en_GB.po (revision 1469) @@ -11,5 +11,5 @@ "Project-Id-Version: JOSM SVN\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2006-10-07 17:02+0200\n" +"POT-Creation-Date: 2006-10-13 23:16+0200\n" "PO-Revision-Date: 2006-07-22 16:18+0100\n" "Last-Translator: Bruce Cowan \n" @@ -20,104 +20,104 @@ "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" -#: src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:52 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:52 msgid "Add segment" msgstr "Add segment" -#: src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:54 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddSegmentAction.java:54 msgid "Add a segment between two nodes." msgstr "Add a segment between two nodes." -#: 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 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:56 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:59 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:370 +#: ../../../../editors/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:46 +#: ../../../../editors/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:58 msgid "Delete" msgstr "Delete" -#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:58 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:58 msgid "Delete nodes, streets or segments." msgstr "Delete nodes, streets or segments." -#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:152 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:152 msgid "Cannot delete node." msgstr "Cannot delete node." -#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:156 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:156 msgid "This object is in use." msgstr "This object is in use." -#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:173 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:173 msgid "Used by more than two segments." msgstr "Used by more than two segments." -#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:178 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:178 msgid "Used by only one segment." msgstr "Used by only one segment." -#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:187 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:187 msgid "Wrong direction of segments." msgstr "Wrong direction of segments." -#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:190 msgid "Conflicting keys" msgstr "Conflicting keys" -#: src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:196 +#: ../../../../editors/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 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:214 msgid "Delete Node" msgstr "Delete Node" -#: src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom" msgstr "Zoom" -#: src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/ZoomAction.java:46 msgid "Zoom in by dragging. (Ctrl+up,left,down,right,+,-)" msgstr "Zoom in by dragging. (Ctrl+up,left,down,right,+,-)" -#: src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:72 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73 msgid "Selection" msgstr "Selection" -#: src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:72 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73 msgid "Select objects by dragging or clicking." msgstr "Select objects by dragging or clicking." -#: src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74 msgid "Straight line" msgstr "Straight line" -#: src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:73 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/SelectionAction.java:74 msgid "Select objects in a straight line." msgstr "Select objects in a straight line." -#: src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:52 -#: src/org/openstreetmap/josm/command/MoveCommand.java:122 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:52 +#: ../../../../editors/josm/src/org/openstreetmap/josm/command/MoveCommand.java:122 msgid "Move" msgstr "Move" -#: src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:54 +#: ../../../../editors/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 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/MoveAction.java:102 msgid "Cannot move objects outside of the world." msgstr "Cannot move objects outside of the world." -#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61 msgid "Add Way" msgstr "Add Way" -#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:61 msgid "Add a new way to the data." msgstr "Add a new way to the data." -#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:95 -#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:143 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:95 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:143 msgid "" "Warning: This way is incomplete. Try to download it, before adding segments." @@ -125,5 +125,5 @@ "Warning: This way is incomplete. Try to download it before adding segments." -#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162 #, fuzzy, java-format msgid "" @@ -144,26 +144,26 @@ "Do you wish to select all segments belonging to the ways instead?" -#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:162 msgid "Add segments from ways" msgstr "Add segments from ways" -#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168 +#: ../../../../editors/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 "" "Do you want to add all other selected segments to the one selected way?" -#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:168 msgid "Add segments to way?" msgstr "Add segments to way?" -#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173 msgid "Reorder all line segments?" msgstr "Reorder all line segments?" -#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:173 msgid "Reorder?" msgstr "Reorder?" -#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232 #, fuzzy, java-format msgid "Create a new way out of {0} segment?" @@ -172,101 +172,183 @@ msgstr[1] "Create a new way out of {0} segment?" -#: src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddWayAction.java:232 msgid "Create new way" msgstr "Create new way" -#: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:46 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47 msgid "Add node" msgstr "Add node" -#: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:46 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47 msgid "Add a new node to the map" msgstr "Add a new node to the map" -#: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48 msgid "Add node into segment" msgstr "Add node into segment" -#: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:47 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:48 msgid "Add a node into an existing segment" msgstr "Add a node into an existing segment" -#: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:83 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:85 msgid "Can not add a node outside of the world." msgstr "Can not add a node outside of the world." -#: src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:132 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/mapmode/AddNodeAction.java:134 msgid "Add Node into Segment" msgstr "Add Node into Segment" -#: src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26 -#: src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:53 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:23 +#, fuzzy +msgid "Raw GPS data" +msgstr "Downloading GPS data" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:26 +msgid "Downloading GPS data" +msgstr "Downloading GPS data" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:25 +#, fuzzy +msgid "OpenStreetMap data" +msgstr "Java Open Street Map - Editor" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:28 +#: ../landsat/src/landsat/DownloadLandsatTask.java:21 +msgid "Downloading data" +msgstr "Downloading data" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:39 +msgid "No data imported." +msgstr "No data imported." + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:40 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:76 +msgid "Data Layer" +msgstr "Data Layer" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:53 #, fuzzy msgid "Reverse Segments" msgstr "segments" -#: src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:26 #, fuzzy msgid "Revert the direction of all selected Segments." msgstr "Wrong direction of segments." -#: src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:39 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ReverseSegmentAction.java:39 #, fuzzy msgid "Please select at least one segment." msgstr "Please select the row to delete." -#: src/org/openstreetmap/josm/actions/PreferencesAction.java:21 -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:217 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:209 msgid "Preferences" msgstr "Preferences" -#: src/org/openstreetmap/josm/actions/PreferencesAction.java:21 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21 msgid "Open a preferences page for global settings." msgstr "Open a preferences page for global settings." -#: src/org/openstreetmap/josm/actions/OpenAction.java:40 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40 msgid "Open" msgstr "Open" -#: src/org/openstreetmap/josm/actions/OpenAction.java:40 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:40 msgid "Open a file." msgstr "Open a file." -#: src/org/openstreetmap/josm/actions/OpenAction.java:73 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:73 msgid "CSV Data import for non-GPS data is not implemented yet." msgstr "CSV Data import for non-GPS data is not implemented yet." -#: src/org/openstreetmap/josm/actions/OpenAction.java:76 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:76 #, java-format msgid "Unknown file extension: {0}" msgstr "Unknown file extension: {0}" -#: src/org/openstreetmap/josm/actions/OpenAction.java:83 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:83 #, java-format msgid "Error while parsing {0}" msgstr "Error while parsing {0}" -#: src/org/openstreetmap/josm/actions/OpenAction.java:86 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/OpenAction.java:86 #, java-format msgid "Could not read \"{0}\"" msgstr "Could not read \"{0}\"" -#: src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:71 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:287 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:302 +#, java-format +msgid "Executing {0}" +msgstr "" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:146 +msgid "The Tool requires some data to be loaded." +msgstr "" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:306 +#, fuzzy, java-format +msgid "Could not execute command: {0}" +msgstr "Could not read \"{0}\"" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:317 +msgid "Tools" +msgstr "" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExternalToolsAction.java:352 +#, fuzzy +msgid "Could not read external tool configuration." +msgstr "Could not detect data format string." + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:69 +msgid "Align Nodes in Circle" +msgstr "" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29 +#, fuzzy +msgid "Move the selected nodes into a circle." +msgstr "Merge the selected layer into the layer directly below." + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AlignInCircleAction.java:39 +#, fuzzy +msgid "Please select at least four nodes." +msgstr "Please select the row to delete." + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:35 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:56 +msgid "Rename layer" +msgstr "" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:44 +msgid "Also rename the file" +msgstr "" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RenameLayerAction.java:80 +#, fuzzy, java-format +msgid "Could not rename the file \"{0}\"." +msgstr "Could not read \"{0}\"" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23 msgid "Undo" msgstr "Undo" -#: src/org/openstreetmap/josm/actions/UndoAction.java:23 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UndoAction.java:23 msgid "Undo the last action." msgstr "Undo the last action." -#: src/org/openstreetmap/josm/actions/DownloadAction.java:87 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:87 msgid "Download from OSM" msgstr "Download from OSM" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:87 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:87 msgid "Download map data from the OSM server." msgstr "Download map data from the OSM server." -#: src/org/openstreetmap/josm/actions/DownloadAction.java:102 +#: ../../../../editors/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 " @@ -276,156 +358,156 @@ "dragging." -#: src/org/openstreetmap/josm/actions/DownloadAction.java:105 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:105 msgid "Bounding box" msgstr "Bounding box" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:106 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:106 msgid "min lat" msgstr "min lat" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:108 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:108 msgid "min lon" msgstr "min lon" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:110 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:110 msgid "max lat" msgstr "max lat" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:112 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:112 msgid "max lon" msgstr "max lon" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:122 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:122 #, fuzzy msgid "Download the following data:" msgstr "Downloading data" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:129 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:129 msgid "URL from www.openstreetmap.org" msgstr "URL from www.openstreetmap.org" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:182 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:182 msgid "Bookmarks" msgstr "Bookmarks" -#: 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 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:198 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:320 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:344 +#: ../../../../editors/josm/src/org/openstreetmap/josm/command/AddCommand.java:52 msgid "Add" msgstr "Add" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:203 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:203 msgid "Please enter the desired coordinates first." msgstr "Please enter the desired coordinates first." -#: src/org/openstreetmap/josm/actions/DownloadAction.java:206 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:206 msgid "Please enter a name for the location." msgstr "Please enter a name for the location." -#: src/org/openstreetmap/josm/actions/DownloadAction.java:214 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:214 msgid "Remove" msgstr "Remove" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:219 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:219 msgid "Select a bookmark first." msgstr "Select a bookmark first." -#: src/org/openstreetmap/josm/actions/DownloadAction.java:238 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:238 msgid "Choose an area" msgstr "Choose an area" -#: src/org/openstreetmap/josm/actions/DownloadAction.java:261 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:261 msgid "Please enter the desired coordinates or click on a bookmark." msgstr "Please enter the desired coordinates or click on a bookmark." -#: src/org/openstreetmap/josm/actions/DownloadAction.java:263 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:263 #, fuzzy msgid "Please select at least one download data type." msgstr "Please select the row to delete." -#: src/org/openstreetmap/josm/actions/ExitAction.java:18 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18 msgid "Exit" msgstr "Exit" -#: src/org/openstreetmap/josm/actions/ExitAction.java:18 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExitAction.java:18 msgid "Exit the application." msgstr "Exit the application." -#: src/org/openstreetmap/josm/actions/AboutAction.java:57 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57 msgid "About" msgstr "About" -#: src/org/openstreetmap/josm/actions/AboutAction.java:57 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:57 msgid "Display the about screen." msgstr "Display the about screen." -#: src/org/openstreetmap/josm/actions/AboutAction.java:67 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:67 #, java-format msgid "Java OpenStreetMap Editor Version {0}" msgstr "Java OpenStreetMap Editor Version {0}" -#: src/org/openstreetmap/josm/actions/AboutAction.java:68 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:68 #, java-format msgid "last change at {0}" msgstr "last change at {0}" -#: src/org/openstreetmap/josm/actions/AboutAction.java:69 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:69 #, fuzzy, java-format msgid "Java Version {0}" msgstr "Java OpenStreetMap Editor Version {0}" -#: src/org/openstreetmap/josm/actions/AboutAction.java:70 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:70 msgid "Homepage" msgstr "Homepage" -#: src/org/openstreetmap/josm/actions/AboutAction.java:72 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:72 msgid "Bug Reports" msgstr "Bug Reports" -#: src/org/openstreetmap/josm/actions/AboutAction.java:74 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:74 #, fuzzy msgid "News about JOSM" msgstr "About JOSM..." -#: src/org/openstreetmap/josm/actions/AboutAction.java:78 -#: src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:78 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListPopup.java:25 msgid "Info" msgstr "Info" -#: src/org/openstreetmap/josm/actions/AboutAction.java:79 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:79 msgid "Readme" msgstr "Readme" -#: src/org/openstreetmap/josm/actions/AboutAction.java:80 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:80 msgid "Revision" msgstr "Revision" -#: src/org/openstreetmap/josm/actions/AboutAction.java:81 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:81 #, fuzzy msgid "Contribution" msgstr "Connection" -#: src/org/openstreetmap/josm/actions/AboutAction.java:85 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:85 msgid "About JOSM..." msgstr "About JOSM..." -#: src/org/openstreetmap/josm/actions/AboutAction.java:95 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AboutAction.java:95 msgid "File could not be found." msgstr "File could not be found." -#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:25 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:25 msgid "No document open so nothing to save." msgstr "No document open so nothing to save." -#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:28 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:28 msgid "The document contains no data. Save anyway?" msgstr "The document contains no data. Save anyway?" -#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:28 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:28 msgid "Empty document" msgstr "Empty document" -#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:32 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:32 msgid "" "There are unresolved conflicts. Conflicts will not be saved and handled as " @@ -435,104 +517,115 @@ "if you rejected all. Continue?" -#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:32 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:32 msgid "Conflicts" msgstr "Conflicts" -#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:79 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:79 msgid "File exists. Overwrite?" msgstr "File exists. Overwrite?" -#: src/org/openstreetmap/josm/actions/DiskAccessAction.java:79 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DiskAccessAction.java:79 msgid "Overwrite" msgstr "Overwrite" -#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:29 msgid "data" msgstr "data" -#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:30 msgid "selection" msgstr "selection" -#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:31 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:31 msgid "layer" msgstr "layer" -#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 -#: src/org/openstreetmap/josm/data/Preferences.java:141 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:32 +#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:141 msgid "conflict" msgstr "conflict" -#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:40 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/AutoScaleAction.java:40 #, java-format msgid "Auto Scale: {0}" msgstr "Auto Scale: {0}" -#: src/org/openstreetmap/josm/actions/AutoScaleAction.java:41 +#: ../../../../editors/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 "Auto zoom the view (to {0}. Disabled if the view is moved)" -#: src/org/openstreetmap/josm/actions/UploadAction.java:36 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:28 +#, fuzzy +msgid "Save as" +msgstr "Save" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAsAction.java:28 +#, fuzzy +msgid "Save the current data to a new file." +msgstr "Save the current data." + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25 +msgid "OSM Server Files (.osm .xml)" +msgstr "OSM Server Files (.osm .xml)" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 +msgid "GPX Files (.gpx)" +msgstr "GPX Files (.gpx)" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 +msgid "CSV Files (.csv .txt)" +msgstr "CSV Files (.csv .txt)" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36 msgid "Upload to OSM" msgstr "Upload to OSM" -#: src/org/openstreetmap/josm/actions/UploadAction.java:36 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:36 msgid "Upload all changes to the OSM server." msgstr "Upload all changes to the OSM server." -#: src/org/openstreetmap/josm/actions/UploadAction.java:41 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:41 msgid "Nothing to upload. Get some data first." msgstr "Nothing to upload. Get some data first." -#: src/org/openstreetmap/josm/actions/UploadAction.java:46 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:46 msgid "There are unresolved conflicts. You have to resolve these first." msgstr "There are unresolved conflicts. You have to resolve these first." -#: src/org/openstreetmap/josm/actions/UploadAction.java:75 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:75 msgid "Uploading data" msgstr "Uploading data" -#: src/org/openstreetmap/josm/actions/UploadAction.java:97 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:97 msgid "No changes to upload." msgstr "No changes to upload." -#: src/org/openstreetmap/josm/actions/UploadAction.java:106 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:106 msgid "Objects to add:" msgstr "Objects to add:" -#: src/org/openstreetmap/josm/actions/UploadAction.java:114 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:114 msgid "Objects to modify:" msgstr "Objects to modify:" -#: src/org/openstreetmap/josm/actions/UploadAction.java:122 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:122 msgid "Objects to delete:" msgstr "Objects to delete:" -#: src/org/openstreetmap/josm/actions/UploadAction.java:129 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/UploadAction.java:129 msgid "Upload this changes?" msgstr "Upload these changes?" -#: src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:25 -msgid "OSM Server Files (.osm .xml)" -msgstr "OSM Server Files (.osm .xml)" - -#: src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:26 -msgid "GPX Files (.gpx)" -msgstr "GPX Files (.gpx)" - -#: src/org/openstreetmap/josm/actions/ExtensionFileFilter.java:27 -msgid "CSV Files (.csv .txt)" -msgstr "CSV Files (.csv .txt)" - -#: src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo" -msgstr "Redo" - -#: src/org/openstreetmap/josm/actions/RedoAction.java:23 -msgid "Redo the last undone action." -msgstr "Redo the last undone action." - -#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:46 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/HelpAction.java:52 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:55 +msgid "Help" +msgstr "Help" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/HelpAction.java:104 +msgid "Can only edit help pages from JOSM Online Help" +msgstr "" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:39 #, fuzzy, java-format msgid "Downloading {0} segment" @@ -541,204 +634,124 @@ msgstr[1] "Downloading {0} segments" -#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:58 -#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:39 -msgid "No data imported." -msgstr "No data imported." - -#: 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 -msgid "Data Layer" -msgstr "Data Layer" - -#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:82 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:57 msgid "Download incomplete objects" msgstr "Download incomplete objects" -#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:82 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:57 msgid "Download all (selected) incomplete ways from the OSM server." msgstr "Download all (selected) incomplete ways from the OSM server." -#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:100 -#, java-format -msgid "Download {0} ways containing a total of {1} segments?" -msgstr "Download {0} ways containing a total of {1} segments?" - -#: src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:100 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:66 +#, fuzzy +msgid "Please select an incomplete way." +msgstr "Please select a colour." + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69 +#, fuzzy, java-format +msgid "Download {0} incomplete ways?" +msgstr "Download incomplete objects" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/DownloadIncompleteAction.java:69 msgid "Download?" msgstr "Download?" -#: src/org/openstreetmap/josm/actions/SaveAction.java:31 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo" +msgstr "Redo" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/RedoAction.java:23 +msgid "Redo the last undone action." +msgstr "Redo the last undone action." + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:40 +msgid "" +"Note: GPL is not compatible to the OSM license. Do not upload GPL licensed " +"tracks." +msgstr "" +"Note: GPL is not compatible to the OSM license. Do not upload GPL licensed " +"tracks." + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:45 +msgid "Export to GPX" +msgstr "Export to GPX" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:45 +msgid "Export the data to GPX file." +msgstr "Export the data to GPX file." + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:51 +msgid "Nothing to export. Get some data first." +msgstr "Nothing to export. Get some data first." + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:75 +msgid "gps track description" +msgstr "gps track description" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:81 +msgid "Add author information" +msgstr "Add author information" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:84 +msgid "Real name" +msgstr "Real name" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:88 +msgid "Email" +msgstr "Email" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:92 +msgid "Copyright (URL)" +msgstr "Copyright (URL)" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:96 +msgid "Predefined" +msgstr "Predefined" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:98 +msgid "Copyright year" +msgstr "Copyright year" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:106 +msgid "Keywords" +msgstr "Keywords" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:110 +msgid "Export options" +msgstr "Export options" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:131 +#, java-format +msgid "Error while exporting {0}" +msgstr "Error while exporting {0}" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:131 +msgid "Error" +msgstr "Error" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/GpxExportAction.java:185 +msgid "Choose a predefined license" +msgstr "Choose a predefined license" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:31 msgid "Save" msgstr "Save" -#: src/org/openstreetmap/josm/actions/SaveAction.java:31 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:31 msgid "Save the current data." msgstr "Save the current data." -#: src/org/openstreetmap/josm/actions/SaveAction.java:58 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:58 msgid "CSV output not supported yet." msgstr "CSV output not supported yet." -#: src/org/openstreetmap/josm/actions/SaveAction.java:61 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:61 msgid "Unknown file extension." msgstr "Unknown file extension." -#: src/org/openstreetmap/josm/actions/SaveAction.java:67 +#: ../../../../editors/josm/src/org/openstreetmap/josm/actions/SaveAction.java:67 msgid "An error occoured while saving." msgstr "An error occoured while saving." -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:40 -msgid "" -"Note: GPL is not compatible to the OSM license. Do not upload GPL licensed " -"tracks." -msgstr "" -"Note: GPL is not compatible to the OSM license. Do not upload GPL licensed " -"tracks." - -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:45 -msgid "Export to GPX" -msgstr "Export to GPX" - -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:45 -msgid "Export the data to GPX file." -msgstr "Export the data to GPX file." - -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:51 -msgid "Nothing to export. Get some data first." -msgstr "Nothing to export. Get some data first." - -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:75 -msgid "gps track description" -msgstr "gps track description" - -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:81 -msgid "Add author information" -msgstr "Add author information" - -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:84 -msgid "Real name" -msgstr "Real name" - -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:88 -msgid "Email" -msgstr "Email" - -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:92 -msgid "Copyright (URL)" -msgstr "Copyright (URL)" - -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:96 -msgid "Predefined" -msgstr "Predefined" - -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:98 -msgid "Copyright year" -msgstr "Copyright year" - -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:106 -msgid "Keywords" -msgstr "Keywords" - -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:110 -msgid "Export options" -msgstr "Export options" - -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:131 -#, java-format -msgid "Error while exporting {0}" -msgstr "Error while exporting {0}" - -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:131 -msgid "Error" -msgstr "Error" - -#: src/org/openstreetmap/josm/actions/GpxExportAction.java:185 -msgid "Choose a predefined license" -msgstr "Choose a predefined license" - -#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:25 -#, fuzzy -msgid "OpenStreetMap data" -msgstr "Java Open Street Map - Editor" - -#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java:28 -msgid "Downloading data" -msgstr "Downloading data" - -#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:23 -#, fuzzy -msgid "Raw GPS data" -msgstr "Downloading GPS data" - -#: src/org/openstreetmap/josm/actions/downloadtasks/DownloadGpsTask.java:26 -msgid "Downloading GPS data" -msgstr "Downloading GPS data" - -#: 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 -#, fuzzy, java-format -msgid "Could not execute command: {0}" -msgstr "Could not read \"{0}\"" - -#: src/org/openstreetmap/josm/actions/ExternalToolsAction.java:317 -msgid "Tools" -msgstr "" - -#: src/org/openstreetmap/josm/actions/ExternalToolsAction.java:352 -#, fuzzy -msgid "Could not read external tool configuration." -msgstr "Could not detect data format string." - -#: src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29 -#: src/org/openstreetmap/josm/actions/AlignInCircleAction.java:69 -msgid "Align Nodes in Circle" -msgstr "" - -#: src/org/openstreetmap/josm/actions/AlignInCircleAction.java:29 -#, fuzzy -msgid "Move the selected nodes into a circle." -msgstr "Merge the selected layer into the layer directly below." - -#: src/org/openstreetmap/josm/actions/AlignInCircleAction.java:39 -#, fuzzy -msgid "Please select at least four nodes." -msgstr "Please select the row to delete." - -#: src/org/openstreetmap/josm/actions/RenameLayerAction.java:35 -#: src/org/openstreetmap/josm/actions/RenameLayerAction.java:56 -msgid "Rename layer" -msgstr "" - -#: src/org/openstreetmap/josm/actions/RenameLayerAction.java:44 -msgid "Also rename the file" -msgstr "" - -#: src/org/openstreetmap/josm/actions/RenameLayerAction.java:80 -#, fuzzy, java-format -msgid "Could not rename the file \"{0}\"." -msgstr "Could not read \"{0}\"" - -#: src/org/openstreetmap/josm/actions/SaveAsAction.java:28 -#, fuzzy -msgid "Save as" -msgstr "Save" - -#: src/org/openstreetmap/josm/actions/SaveAsAction.java:28 -#, fuzzy -msgid "Save the current data to a new file." -msgstr "Save the current data." - -#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 +#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:44 #, java-format msgid "" @@ -748,13 +761,13 @@ msgstr "" -#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 +#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Do nothing" msgstr "Do nothing" -#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 +#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:50 msgid "Report Bug" msgstr "Report Bug" -#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 +#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:51 msgid "" "An unexpected exception occoured.\n" @@ -768,9 +781,9 @@ "version of JOSM, please consider be kind and file a bug report." -#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 +#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:54 msgid "Unexpected Exception" msgstr "Unexpected Exception" -#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:62 +#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:62 msgid "" "Please send this to josm@eigenheimstrasse.de\n" @@ -780,5 +793,5 @@ "\n" -#: src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:83 +#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/BugReportExceptionHandler.java:83 msgid "" "Please send an email with the following information to josm@eigenheimstrasse." @@ -788,86 +801,61 @@ "de" -#: src/org/openstreetmap/josm/tools/ShortCutLabel.java:12 +#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:12 msgid "Ctrl-" msgstr "Ctrl-" -#: src/org/openstreetmap/josm/tools/ShortCutLabel.java:14 +#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:14 msgid "Alt-" msgstr "Alt-" -#: src/org/openstreetmap/josm/tools/ShortCutLabel.java:16 +#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:16 msgid "AltGr-" msgstr "AltGr-" -#: src/org/openstreetmap/josm/tools/ShortCutLabel.java:18 +#: ../../../../editors/josm/src/org/openstreetmap/josm/tools/ShortCutLabel.java:18 msgid "Shift-" msgstr "Shift-" -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:63 +#: ../../../../editors/josm/src/org/openstreetmap/josm/plugins/PluginException.java:17 +#, fuzzy, java-format +msgid "An error occoured in plugin {0}" +msgstr "An error occoured while saving." + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:63 msgid "Load Selection" msgstr "Load Selection" -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:70 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:70 #, java-format msgid "Contact {0}..." msgstr "Contact {0}..." -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:75 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:75 msgid "Downloading..." msgstr "Downloading..." -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:87 #, java-format msgid "Could not read from url: \"{0}\"" msgstr "Could not read from url: \"{0}\"" -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:90 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:90 #, java-format msgid "Parsing error in url: \"{0}\"" msgstr "Parsing error in url: \"{0}\"" -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113 msgid "Current Selection" msgstr "Current Selection" -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:113 msgid "Open a selection list window." msgstr "Open a selection list window." -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:128 -#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72 -msgid "Select" -msgstr "Select" - -#: 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 "" -"Set the selected elements on the map to the selected items in the list above." - -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:137 -#: src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83 -msgid "Reload" -msgstr "Reload" - -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:138 -msgid "Refresh the selection list." -msgstr "Refresh the selection list." - -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:146 -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:180 -msgid "Search" -msgstr "Search" - -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:147 -msgid "Search for objects." -msgstr "Search for objects." - -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:151 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:143 msgid "Please enter a search string." msgstr "Please enter a search string." -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:145 msgid "" "Fulltext search.
  • Baker Street - 'Baker' and " @@ -883,87 +871,114 @@ "li>
  • foot: - key=foot set to any value.
" -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:161 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:153 msgid "replace selection" msgstr "replace selection" -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:162 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:154 msgid "add to selection" msgstr "add to selection" -#: src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:163 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:155 msgid "remove from selection" msgstr "remove from selection" -#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:172 +msgid "Search" +msgstr "Search" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51 msgid "Conflict" msgstr "Conflict" -#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51 msgid "Merging conflicts." msgstr "Merging conflicts." -#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:63 msgid "Resolve" msgstr "Resolve" -#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64 msgid "Open a merge dialog of all selected items in the list above." msgstr "Open a merge dialog of all selected items in the list above." -#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:106 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73 +msgid "Select" +msgstr "Select" + +#: ../../../../editors/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 "" +"Set the selected elements on the map to the selected items in the list above." + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:108 msgid "Please select something from the conflict list." msgstr "Please select something from the conflict list." -#: src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:117 msgid "Resolve Conflicts" msgstr "Resolve Conflicts" -#: src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:82 +msgid "Click Reload to refresh list" +msgstr "" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:83 +msgid "Reload" +msgstr "Reload" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:84 +#, fuzzy +msgid "Revert" +msgstr "Remove" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87 +msgid "History" +msgstr "" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:87 +msgid "Display the history of all selected items." +msgstr "" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapStatus.java:225 +msgid "Object" +msgstr "Object" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:96 +msgid "Date" +msgstr "" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:131 +msgid "Reload all currently selected objects and refresh the list." +msgstr "" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:135 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:180 +msgid "Not implemented yet." +msgstr "Not implemented yet." + +#: ../../../../editors/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 "" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 msgid "Command Stack" msgstr "Command Stack" -#: src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31 msgid "Open a list of all commands (undo buffer)." msgstr "Open a list of all commands (undo buffer)." -#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:58 -msgid "Delete the selected layer." -msgstr "Delete the selected layer." - -#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:79 -msgid "Show/Hide" -msgstr "Show/Hide" - -#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:80 -msgid "Toggle visible state of the selected layer." -msgstr "Toggle visible state of the selected layer." - -#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:118 -msgid "Layers" -msgstr "Layers" - -#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:118 -msgid "Open a list of all loaded layers." -msgstr "Open a list of all loaded layers." - -#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:190 -msgid "Move the selected layer one row up." -msgstr "Move the selected layer one row up." - -#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:195 -msgid "Move the selected layer one row down." -msgstr "Move the selected layer one row down." - -#: src/org/openstreetmap/josm/gui/dialogs/LayerList.java:208 -msgid "Merge the selected layer into the layer directly below." -msgstr "Merge the selected layer into the layer directly below." - -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:99 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:99 #, fuzzy msgid "Please select the objects you want to change properties for." msgstr "Please select the row to delete." -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102 -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 #, fuzzy, java-format msgid "This will change {0} object." @@ -972,5 +987,5 @@ msgstr[1] "This will change {0} object." -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:102 #, java-format msgid "" @@ -979,46 +994,46 @@ "Please select a new value for \"{0}\".
(Empty string deletes the key.)" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:114 -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:178 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:114 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:178 msgid "Change values?" msgstr "Change values?" -#: 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 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:132 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:284 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:369 msgid "" msgstr "" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:151 +#: ../../../../editors/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 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:156 msgid "Please select a key" msgstr "Please select a key" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:169 msgid "Please select a value" msgstr "Please select a value" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222 msgid "Properties" msgstr "Properties" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:222 msgid "Property for selected objects." msgstr "Properties for selected objects." -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:241 #, fuzzy, java-format msgid "Could not read annotation preset source: {0}" msgstr "Could not read from url: \"{0}\"" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:244 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:244 #, fuzzy, java-format msgid "Error parsing {0}: " msgstr "Error while parsing {0}" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:263 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:263 #, fuzzy, java-format msgid "Change {0} object" @@ -1027,87 +1042,112 @@ msgstr[1] "This will change {0} object." -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276 -#: src/org/openstreetmap/josm/gui/ConflictResolver.java:81 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81 msgid "Key" msgstr "Key" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276 -#: src/org/openstreetmap/josm/gui/ConflictResolver.java:81 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:276 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:81 msgid "Value" msgstr "Value" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:309 -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:380 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:309 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:359 msgid "Please select the row to edit." msgstr "Please select the row to edit." -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:314 -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:395 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:314 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:374 msgid "Please select the row to delete." msgstr "Please select the row to delete." -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:320 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:320 msgid "Add a new key/value pair to all objects" msgstr "Add a new key/value pair to all objects" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321 -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:376 -#: src/org/openstreetmap/josm/Main.java:218 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:53 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:355 msgid "Edit" msgstr "Edit" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:321 msgid "Edit the value of the selected key for all objects" msgstr "Edit the value of the selected key for all objects" -#: src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:322 msgid "Delete the selected key in all objects" msgstr "Delete the selected key in all objects" -#: 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 -#, fuzzy -msgid "Revert" -msgstr "Remove" - -#: 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 "Object" - -#: 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 "Not implemented yet." - -#: 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 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:60 +msgid "Delete the selected layer." +msgstr "Delete the selected layer." + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:82 +msgid "Show/Hide" +msgstr "Show/Hide" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:83 +msgid "Toggle visible state of the selected layer." +msgstr "Toggle visible state of the selected layer." + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:122 +msgid "Layers" +msgstr "Layers" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:122 +msgid "Open a list of all loaded layers." +msgstr "Open a list of all loaded layers." + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:196 +msgid "Move the selected layer one row up." +msgstr "Move the selected layer one row up." + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:202 +msgid "Move the selected layer one row down." +msgstr "Move the selected layer one row down." + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:216 +msgid "Merge the selected layer into the layer directly below." +msgstr "Merge the selected layer into the layer directly below." + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:160 +#, fuzzy, java-format +msgid "Unknown type at line {0}" +msgstr "Unknown file extension: {0}" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:178 +#, java-format +msgid "Cannot have a writable combobox with default values (line {0})" +msgstr "" + +#: ../../../../editors/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 "" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:184 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:185 +#, fuzzy +msgid "element" +msgid_plural "elements" +msgstr[0] "segment" +msgstr[1] "segment" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:190 +#, java-format +msgid "Unknown annotation object {0} at line {1} column {2}" +msgstr "" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:258 +#, fuzzy +msgid "Change Properties" +msgstr "Properties" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:161 +#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:66 +#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:135 +#: ../../../../editors/josm/src/org/openstreetmap/josm/command/MoveCommand.java:122 #, fuzzy msgid "node" @@ -1116,7 +1156,7 @@ msgstr[1] "node" -#: 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 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:162 +#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:53 +#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:136 #, fuzzy msgid "segment" @@ -1125,7 +1165,7 @@ msgstr[1] "segment" -#: 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 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:163 +#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:92 +#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:137 #, fuzzy msgid "way" @@ -1134,23 +1174,23 @@ msgstr[1] "way" -#: src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:178 msgid "There were conflicts during import." msgstr "There were conflicts during import." -#: src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:317 #, java-format msgid "{0} consists of:" msgstr "{0} consists of:" -#: src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:321 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:321 #, java-format msgid " ({0} deleted.)" msgstr " ({0} deleted.)" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:57 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:57 msgid "Convert to data layer" msgstr "Convert to data layer" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:159 #, fuzzy msgid "track" @@ -1159,5 +1199,5 @@ msgstr[1] "track" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:160 #, fuzzy msgid "point" @@ -1166,5 +1206,5 @@ msgstr[1] "point" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:185 #, fuzzy, java-format msgid "a track with {0} point" @@ -1173,5 +1213,5 @@ msgstr[1] "a track with {0} point" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, fuzzy, java-format msgid "{0} consists of {1} track" @@ -1180,5 +1220,5 @@ msgstr[1] "{0} consists of {1} track" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:189 #, fuzzy, java-format msgid "{0} point" @@ -1187,110 +1227,110 @@ msgstr[1] "{0} point" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:193 #, fuzzy msgid "Customize line drawing" msgstr "Customise Colour" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:197 #, fuzzy msgid "Use global settings." msgstr "Display Settings" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:198 #, fuzzy msgid "Draw lines between points for this layer." msgstr "Draw lines between raw gps points." -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:199 #, fuzzy msgid "Do not draw lines between points for this layer." msgstr "Draw lines between raw gps points." -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:211 +#: ../../../../editors/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 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:222 msgid "Customize Color" msgstr "Customise Colour" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227 msgid "OK" msgstr "OK" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227 -#: src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:25 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:24 msgid "Cancel" msgstr "Cancel" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:227 msgid "Default" msgstr "Default" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:228 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:228 msgid "Choose a color" msgstr "Choose a colour" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:243 msgid "Import images" msgstr "Import images" -#: src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:255 -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:349 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:255 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:349 msgid "JPEG images (*.jpg)" msgstr "JPEG images (*.jpg)" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:90 +#: ../../../../editors/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 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:95 msgid "Read GPS..." msgstr "Read GPS..." -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:102 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:102 #, java-format msgid "No time for point {0} x {1}" msgstr "No time for point {0} x {1}" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:107 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:107 #, java-format msgid "Cannot read time \"{0}\" from point {1} x {2}" msgstr "Cannot read time \"{0}\" from point {1} x {2}" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:114 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:114 msgid "No images with readable timestamps found." msgstr "No images with readable timestamps found." -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125 #, java-format msgid "Reading {0}..." msgstr "Reading {0}..." -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:191 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:191 msgid "Geotagged Images" msgstr "Geotagged Images" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:269 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:269 #, java-format msgid "GPS start: {0}" msgstr "GPS start: {0}" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:270 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:270 #, java-format msgid "GPS end: {0}" msgstr "GPS end: {0}" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:272 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:272 #, java-format msgid "current delta: {0}s" msgstr "current delta: {0}s" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:273 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:273 msgid "timezone difference: " msgstr "timezone difference: " -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 #, fuzzy msgid "image" @@ -1299,132 +1339,132 @@ msgstr[1] "image" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:297 #, java-format msgid "{0} within the track." msgstr "{0} within the track." -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:338 msgid "Sync clock" msgstr "Sync clock" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:395 #, java-format msgid "The date in file \"{0}\" could not be parsed." msgstr "The date in file \"{0}\" could not be parsed." -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:399 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:399 #, java-format msgid "There is no EXIF time within the file \"{0}\"." msgstr "There is no EXIF time within the file \"{0}\"." -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:403 msgid "Image" msgstr "Image" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:405 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:405 msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)" msgstr "Enter shown date (mm/dd/yyyy HH:MM:SS)" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:408 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:408 msgid "GPS unit timezome (difference to photo)" msgstr "GPS unit timezome (difference to photo)" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:416 msgid "Syncronize Time with GPS Unit" msgstr "Synchronise Time with GPS Unit" -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:432 -#: src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:434 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:432 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:434 msgid "Time entered could not be parsed." msgstr "Time entered could not be parsed." -#: src/org/openstreetmap/josm/gui/BookmarkList.java:74 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:74 msgid "Could not read bookmarks." msgstr "Could not read bookmarks." -#: src/org/openstreetmap/josm/gui/BookmarkList.java:98 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/BookmarkList.java:98 msgid "Could not write bookmark." msgstr "Could not write bookmark." -#: src/org/openstreetmap/josm/gui/MapView.java:123 -#: src/org/openstreetmap/josm/gui/MainApplication.java:172 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapView.java:123 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:171 msgid "Java Open Street Map - Editor" msgstr "Java Open Street Map - Editor" -#: src/org/openstreetmap/josm/gui/MapView.java:163 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapView.java:163 msgid "layer not in list." msgstr "layer not in list." -#: src/org/openstreetmap/josm/gui/MainApplication.java:53 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:55 msgid "Hint: Some changes came from uploading new data to the server." msgstr "Hint: Some changes came from uploading new data to the server." -#: src/org/openstreetmap/josm/gui/MainApplication.java:55 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:57 msgid "There are unsaved changes. Really quit?" msgstr "There are unsaved changes. Really quit?" -#: src/org/openstreetmap/josm/gui/MainApplication.java:56 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:58 msgid "Unsaved Changes" msgstr "Unsaved Changes" -#: src/org/openstreetmap/josm/gui/MainApplication.java:145 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:144 #, fuzzy msgid "Java OpenStreetMap Editor" msgstr "Java Open Street Map - Editor" -#: src/org/openstreetmap/josm/gui/MainApplication.java:146 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:145 msgid "usage" msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplication.java:148 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:147 #, fuzzy msgid "options" msgstr "Export options" -#: src/org/openstreetmap/josm/gui/MainApplication.java:149 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:148 msgid "Show this help" msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplication.java:150 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:149 msgid "Standard unix geometry argument" msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplication.java:151 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:150 msgid "Download the bounding box" msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplication.java:152 +#: ../../../../editors/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 +#: ../../../../editors/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 +#: ../../../../editors/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 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:154 msgid "Select with the given search" msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplication.java:156 +#: ../../../../editors/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 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:156 msgid "Reset the preferences to default" msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplication.java:158 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:157 msgid "Set the language. Example: " msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplication.java:159 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplication.java:158 msgid "examples" msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplication.java:165 +#: ../../../../editors/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" @@ -1432,13 +1472,29 @@ msgstr "" -#: src/org/openstreetmap/josm/gui/MainApplication.java:167 +#: ../../../../editors/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 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:52 +msgid "Layer" +msgstr "Layer" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:56 +msgid "Files" +msgstr "Files" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainMenu.java:57 +msgid "Connection" +msgstr "Connection" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:22 +msgid "Contacting the OSM server..." +msgstr "Contacting the OSM server..." + +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MapStatus.java:223 msgid "Lat/Lon" msgstr "Lat/Lon" -#: src/org/openstreetmap/josm/gui/ConflictResolver.java:232 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:232 #, fuzzy, java-format msgid "{0} object has conflicts:" @@ -1447,49 +1503,49 @@ msgstr[1] "{0} object has conflicts:" -#: src/org/openstreetmap/josm/gui/ConflictResolver.java:235 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:235 msgid "my version:" msgstr "my version:" -#: src/org/openstreetmap/josm/gui/ConflictResolver.java:241 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:241 msgid "their version:" msgstr "their version:" -#: src/org/openstreetmap/josm/gui/ConflictResolver.java:247 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/ConflictResolver.java:247 msgid "resolved version:" msgstr "resolved version:" -#: src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:77 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:77 msgid "Error while parsing" msgstr "Error while parsing" -#: src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:80 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:80 msgid "File Not found" msgstr "File Not found" -#: src/org/openstreetmap/josm/gui/MainApplet.java:34 -#: src/org/openstreetmap/josm/gui/MainApplet.java:35 -#: src/org/openstreetmap/josm/gui/MainApplet.java:36 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:34 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:35 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:36 msgid "string" msgstr "string" -#: src/org/openstreetmap/josm/gui/MainApplet.java:34 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:34 msgid "Name of the user." msgstr "Name of the user." -#: src/org/openstreetmap/josm/gui/MainApplet.java:35 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:35 msgid "OSM Password." msgstr "OSM Password." -#: src/org/openstreetmap/josm/gui/MainApplet.java:36 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:36 msgid "Size the applet to the given geometry (format: WIDTHxHEIGHT)" msgstr "Size the applet to the given geometry (format: WIDTHxHEIGHT)" -#: src/org/openstreetmap/josm/gui/MainApplet.java:37 -#: src/org/openstreetmap/josm/gui/MainApplet.java:38 -#: src/org/openstreetmap/josm/gui/MainApplet.java:39 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:37 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:39 msgid "string;string;..." msgstr "string;string;..." -#: src/org/openstreetmap/josm/gui/MainApplet.java:37 +#: ../../../../editors/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 " @@ -1499,5 +1555,5 @@ "filename" -#: src/org/openstreetmap/josm/gui/MainApplet.java:38 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:38 msgid "" "Download each as raw gps. Can be x1,y1,x2,y2 an url containing " @@ -1507,5 +1563,5 @@ "lat=y&lon=x&zoom=z or a filename" -#: src/org/openstreetmap/josm/gui/MainApplet.java:39 +#: ../../../../editors/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 " @@ -1515,43 +1571,43 @@ "url which returns osm-xml" -#: src/org/openstreetmap/josm/gui/MainApplet.java:40 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40 msgid "any" msgstr "any" -#: src/org/openstreetmap/josm/gui/MainApplet.java:40 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:40 msgid "If specified, reset the configuration instead of reading it." msgstr "If specified, reset the configuration instead of reading it." -#: src/org/openstreetmap/josm/gui/MainApplet.java:65 -#: src/org/openstreetmap/josm/io/OsmConnection.java:68 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:65 +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:68 msgid "Username" msgstr "Username" -#: src/org/openstreetmap/josm/gui/MainApplet.java:68 -#: src/org/openstreetmap/josm/io/OsmConnection.java:71 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/MainApplet.java:68 +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:71 msgid "Password" msgstr "Password" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:125 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:123 msgid "You have to restart JOSM for some settings to take effect." msgstr "You have to restart JOSM for some settings to take effect." -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:193 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:185 msgid "Draw lines between raw gps points." msgstr "Draw lines between raw gps points." -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:197 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:189 msgid "Force lines if no segments imported." msgstr "Force lines if no segments imported." -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:198 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:190 msgid "Draw large GPS points." msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:199 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:191 msgid "Draw Direction Arrows" msgstr "Draw Direction Arrows" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:273 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:250 msgid "" "Force drawing of lines if the imported data contain no line information." @@ -1559,47 +1615,47 @@ "Force drawing of lines if the imported data contain no line information." -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:277 +#: ../../../../editors/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 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:255 msgid "Draw direction hints for all segments." msgstr "Draw direction hints for all segments." -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:327 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:306 msgid "Color" msgstr "Colour" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:328 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:307 msgid "Name" msgstr "Name" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:349 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:328 msgid "Choose" msgstr "Choose" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:353 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:332 msgid "Please select a color." msgstr "Please select a colour." -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:358 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:337 #, java-format msgid "Choose a color for {0}" msgstr "Choose a colour for {0}" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:368 -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:382 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:347 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:361 msgid "Annotation preset source" msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:407 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:386 msgid "The base URL to the OSM server (REST API)" msgstr "The base URL to the OSM server (REST API)" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:408 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:387 msgid "Login name (email) to the OSM account." msgstr "Login name (email) to the OSM account." -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:409 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:388 msgid "" "Login password to the OSM account. Leave blank to not store any password." @@ -1607,9 +1663,9 @@ "Login password to the OSM account. Leave blank to not store any password." -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:410 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:389 msgid "The base URL to the server retrieving WMS background pictures from." msgstr "The base URL to the server retrieving WMS background pictures from." -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:411 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:390 msgid "" "Import string specification. lat/lon and time are imported.
lat" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:418 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:397 msgid "" "If your gps device draw to few lines, select this to draw lines along your " @@ -1635,9 +1691,9 @@ "way." -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:419 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:398 msgid "Colors used by different objects in JOSM." msgstr "Colours used by different objects in JOSM." -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:420 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:399 msgid "" "The sources (url or filename) of annotation preset definition files. See " @@ -1645,18 +1701,18 @@ msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:421 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:400 msgid "Add a new annotation preset source to the list." msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:422 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:401 #, fuzzy msgid "Delete the selected source from the list." msgstr "Delete the selected layer." -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:427 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:406 msgid "Display Settings" msgstr "Display Settings" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:427 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:406 msgid "" "Various settings that influence the visual representation of the whole " @@ -1666,37 +1722,33 @@ "program." -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:428 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:407 msgid "Look and Feel" msgstr "Look and Feel" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:431 -msgid "Language" -msgstr "" - -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:438 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:414 msgid "Colors" msgstr "Colours" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:445 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:421 msgid "Connection Settings" msgstr "Connection Settings" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:445 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:421 msgid "Connection Settings to the OSM server." msgstr "Connection Settings to the OSM server." -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:446 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:422 msgid "Base Server URL" msgstr "Base Server URL" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:448 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:424 msgid "OSM username (email)" msgstr "OSM username (email)" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:450 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:426 msgid "OSM password" msgstr "OSM password" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:452 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:428 msgid "" "WARNING: The password is stored in plain text in the preferences file." @@ -1708,146 +1760,108 @@ "url.
Do not use a valuable Password." -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:461 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:437 msgid "CSV import specification (empty: read from first line in data)" msgstr "CSV import specification (empty: read from first line in data)" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:466 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:442 msgid "Map Settings" msgstr "Map Settings" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:466 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:442 msgid "Settings for the map projection and data interpretation." msgstr "Settings for the map projection and data interpretation." -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:467 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:443 msgid "Projection method" msgstr "Projection method" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:470 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:446 msgid "Annotation preset sources" msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:486 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:462 msgid "Plugins" msgstr "" -#: src/org/openstreetmap/josm/gui/PreferenceDialog.java:486 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:462 msgid "Configure available Plugins." msgstr "" -#: src/org/openstreetmap/josm/gui/annotation/AnnotationPreset.java:160 -#, fuzzy, java-format -msgid "Unknown type at line {0}" -msgstr "Unknown file extension: {0}" - -#: 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 -#, fuzzy -msgid "element" -msgid_plural "elements" -msgstr[0] "segment" -msgstr[1] "segment" - -#: 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 -#, fuzzy -msgid "Change Properties" -msgstr "Properties" - -#: src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:23 -msgid "Contacting the OSM server..." -msgstr "Contacting the OSM server..." - -#: src/org/openstreetmap/josm/io/ObjectListDownloader.java:41 -msgid "Conflicts in disjunct objects" -msgstr "Conflicts in disjunct objects" - -#: src/org/openstreetmap/josm/io/ObjectListDownloader.java:59 -#, java-format -msgid "Downloading {0} {1}" -msgstr "Downloading {0} {1}" - -#: src/org/openstreetmap/josm/io/ObjectListDownloader.java:66 -msgid "Got more than one object when expecting only one." -msgstr "Got more than one object when expecting only one." - -#: src/org/openstreetmap/josm/io/OsmReader.java:96 -#: src/org/openstreetmap/josm/io/OsmReader.java:98 +#: ../../../../editors/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:465 +msgid "Get more plugins" +msgstr "" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 +#, java-format +msgid "Downloading points {0} to {1}..." +msgstr "Downloading points {0} to {1}..." + +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:89 +msgid "Downloading OSM data..." +msgstr "Downloading OSM data..." + +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:101 +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:103 msgid "Unknown version" msgstr "Unknown version" -#: src/org/openstreetmap/josm/io/OsmReader.java:114 +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:119 msgid "Found tag on non-way." msgstr "Found tag on non-way." -#: src/org/openstreetmap/josm/io/OsmReader.java:117 +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:122 msgid "Incomplete segment with id=0" msgstr "Incomplete segment with id=0" -#: src/org/openstreetmap/josm/io/OsmReader.java:126 +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:131 msgid "NullPointerException. Possible some missing tags." msgstr "NullPointerException. Possible some missing tags." -#: src/org/openstreetmap/josm/io/OsmReader.java:141 +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:146 msgid "Illegal object with id=0" msgstr "Illegal object with id=0" -#: src/org/openstreetmap/josm/io/OsmReader.java:149 +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:154 #, java-format msgid "Couldn''t read time format \"{0}\"." msgstr "Couldn''t read time format \"{0}\"." -#: src/org/openstreetmap/josm/io/OsmReader.java:164 +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:169 #, java-format msgid "Missing required attirbute \"{0}\"." msgstr "Missing required attribute \"{0}\"." -#: src/org/openstreetmap/josm/io/OsmReader.java:213 +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:239 msgid "Preparing data..." msgstr "Preparing data..." -#: src/org/openstreetmap/josm/io/OsmReader.java:222 +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmReader.java:249 msgid "Illformed Node id" msgstr "Illformed Node id" -#: src/org/openstreetmap/josm/io/OsmServerWriter.java:71 +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:71 #, java-format msgid "Upload {0} {1} ({2})..." msgstr "Upload {0} {1} ({2})..." -#: src/org/openstreetmap/josm/io/OsmServerWriter.java:185 +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmServerWriter.java:185 msgid "Unknown host" msgstr "Unknown host" -#: src/org/openstreetmap/josm/io/RawGpsReader.java:43 +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawGpsReader.java:43 #, java-format msgid "Data error: lat value \"{0}\" is out of bound." msgstr "Data error: lat value \"{0}\" is out of bound." -#: src/org/openstreetmap/josm/io/RawGpsReader.java:45 +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawGpsReader.java:45 #, java-format msgid "Data error: lon value \"{0}\" is out of bound." msgstr "Data error: lon value \"{0}\" is out of bound." -#: src/org/openstreetmap/josm/io/RawCsvReader.java:39 +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:39 msgid "Could not detect data format string." msgstr "Could not detect data format string." -#: src/org/openstreetmap/josm/io/RawCsvReader.java:62 +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:62 msgid "" "Format string in data is incomplete or not found. Try setting an manual " @@ -1857,5 +1871,5 @@ "format string in Preferences." -#: src/org/openstreetmap/josm/io/RawCsvReader.java:63 +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:63 msgid "" "Format string is incomplete. Need at least 'lat' and 'lon' specification" @@ -1863,96 +1877,97 @@ "Format string is incomplete. Need at least 'lat' and 'lon' specification" -#: src/org/openstreetmap/josm/io/RawCsvReader.java:83 +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:83 #, java-format msgid "Unknown data type: \"{0}\"." msgstr "Unknown data type: \"{0}\"." -#: src/org/openstreetmap/josm/io/RawCsvReader.java:83 +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:83 msgid "Maybe add an format string in preferences." msgstr "Maybe add an format string in preferences." -#: src/org/openstreetmap/josm/io/RawCsvReader.java:88 +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/RawCsvReader.java:88 #, java-format msgid "Parsing error in line {0}" msgstr "Parsing error in line {0}" -#: src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:45 -#, java-format -msgid "Downloading points {0} to {1}..." -msgstr "Downloading points {0} to {1}..." - -#: src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:89 -msgid "Downloading OSM data..." -msgstr "Downloading OSM data..." - -#: src/org/openstreetmap/josm/io/OsmConnection.java:67 +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:67 msgid "Incorrect password or username." msgstr "Incorrect password or username." -#: src/org/openstreetmap/josm/io/OsmConnection.java:74 +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:74 msgid "Warning: The password is transferred unencrypted." msgstr "Warning: The password is transferred unencrypted." -#: src/org/openstreetmap/josm/io/OsmConnection.java:78 +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:78 msgid "Save user and password (unencrypted)" msgstr "Save user and password (unencrypted)" -#: src/org/openstreetmap/josm/io/OsmConnection.java:81 +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:81 msgid "Enter Password" msgstr "Enter Password" -#: src/org/openstreetmap/josm/io/OsmConnection.java:116 +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmConnection.java:116 msgid "Aborting..." msgstr "Aborting..." -#: src/org/openstreetmap/josm/io/OsmIdReader.java:34 +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/IncompleteDownloader.java:80 +#, java-format +msgid "Data error: Segment {0} is deleted but part of Way {1}" +msgstr "" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/IncompleteDownloader.java:115 +#, java-format +msgid "Data error: Node {0} is deleted but part of Segment {1}" +msgstr "" + +#: ../../../../editors/josm/src/org/openstreetmap/josm/io/OsmIdReader.java:34 msgid "Error during parse." msgstr "Error during parse." -#: src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19 +#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:19 msgid "position" msgstr "position" -#: src/org/openstreetmap/josm/data/conflict/ConflictItem.java:33 +#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:33 msgid "different" msgstr "different" -#: src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14 +#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:14 msgid "deleted" msgstr "deleted" -#: src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18 +#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18 msgid "true" msgstr "true" -#: src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18 +#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:18 msgid "false" msgstr "false" -#: src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21 +#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:21 msgid "none" msgstr "none" -#: src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25 +#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/SegmentConflict.java:25 msgid "segments" msgstr "segments" -#: src/org/openstreetmap/josm/data/conflict/ToConflict.java:19 +#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/ToConflict.java:19 msgid "to" msgstr "to" -#: src/org/openstreetmap/josm/data/conflict/FromConflict.java:19 +#: ../../../../editors/josm/src/org/openstreetmap/josm/data/conflict/FromConflict.java:19 msgid "from" msgstr "from" -#: src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48 +#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48 msgid "new" msgstr "new" -#: src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48 +#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:48 msgid "unknown" msgstr "unknown" -#: src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:87 +#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:87 #, fuzzy, java-format msgid "{0} node" @@ -1961,52 +1976,52 @@ msgstr[1] "{0} node" -#: src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:89 +#: ../../../../editors/josm/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:89 msgid "incomplete" msgstr "incomplete" -#: src/org/openstreetmap/josm/data/Preferences.java:134 +#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:134 msgid "background" msgstr "background" -#: src/org/openstreetmap/josm/data/Preferences.java:138 +#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:138 msgid "incomplete way" msgstr "incomplete way" -#: src/org/openstreetmap/josm/data/Preferences.java:139 +#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:139 msgid "selected" msgstr "selected" -#: src/org/openstreetmap/josm/data/Preferences.java:140 +#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:140 msgid "gps point" msgstr "gps point" -#: src/org/openstreetmap/josm/data/Preferences.java:142 +#: ../../../../editors/josm/src/org/openstreetmap/josm/data/Preferences.java:142 msgid "scale" msgstr "" -#: src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77 +#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:77 #, java-format msgid "Resolve {0} conflicts in {1} objects" msgstr "Resolve {0} conflicts in {1} objects" -#: src/org/openstreetmap/josm/command/ChangeCommand.java:37 +#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangeCommand.java:37 msgid "Change" msgstr "Change" -#: src/org/openstreetmap/josm/command/SequenceCommand.java:51 +#: ../../../../editors/josm/src/org/openstreetmap/josm/command/SequenceCommand.java:51 msgid "Sequence" msgstr "Sequence" -#: src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66 +#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66 #, java-format msgid "Remove \"{0}\" for" msgstr "Remove \"{0}\" for" -#: src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66 +#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:66 #, java-format msgid "Set {0}={1} for" msgstr "Set {0}={1} for" -#: src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72 +#: ../../../../editors/josm/src/org/openstreetmap/josm/command/ChangePropertyCommand.java:72 #, fuzzy msgid "object" @@ -2015,61 +2030,84 @@ msgstr[1] "object" -#: src/org/openstreetmap/josm/plugins/PluginException.java:17 -#, fuzzy, java-format -msgid "An error occoured in plugin {0}" -msgstr "An error occoured while saving." - -#: 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 "Files" - -#: src/org/openstreetmap/josm/Main.java:206 -msgid "Connection" -msgstr "Connection" - -#: src/org/openstreetmap/josm/Main.java:213 -msgid "Layer" -msgstr "Layer" - -#: src/org/openstreetmap/josm/Main.java:234 -msgid "Help" -msgstr "Help" - -#: src/org/openstreetmap/josm/Main.java:267 +#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:201 #, java-format msgid "Plugin not found: {0}." msgstr "" -#: src/org/openstreetmap/josm/Main.java:270 +#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:204 #, fuzzy, java-format msgid "Could not load plugin {0}." msgstr "Could not read \"{0}\"" -#: src/org/openstreetmap/josm/Main.java:293 +#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:228 msgid "unnamed" msgstr "unnamed" -#: src/org/openstreetmap/josm/Main.java:343 +#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:271 msgid "The projection could not be read from preferences. Using EPSG:4263." msgstr "The projection could not be read from preferences. Using EPSG:4263." -#: src/org/openstreetmap/josm/Main.java:401 +#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:329 #, java-format msgid "Ignoring malformed url: \"{0}\"" msgstr "Ignoring malformed url: \"{0}\"" -#: src/org/openstreetmap/josm/Main.java:413 +#: ../../../../editors/josm/src/org/openstreetmap/josm/Main.java:341 #, java-format msgid "Ignoring malformed file url: \"{0}\"" msgstr "Ignoring malformed file url: \"{0}\"" +#: ../osmarender/src/OsmarenderPlugin.java:102 +#: ../osmarender/src/OsmarenderPlugin.java:108 +msgid "View" +msgstr "" + +#: ../landsat/src/landsat/DownloadLandsatTask.java:18 +#, fuzzy +msgid "Landsat background images" +msgstr "Download and show landsat background images." + +#: ../landsat/src/landsat/LandsatLayer.java:45 +#, fuzzy +msgid "Wrong longitude transformation for tile manager. Can't operate on {0}" +msgstr "Wrong longitude transformation for tile cache. Can't operate on {0}" + +#: ../landsat/src/landsat/LandsatLayer.java:70 +#, java-format +msgid "WMS layer: {0}" +msgstr "WMS layer: {0}" + +#: ../annotation-tester/src/annotationtester/AnnotationTesterAction.java:20 +msgid "Annotation Preset Tester" +msgstr "" + +#: ../annotation-tester/src/annotationtester/AnnotationTesterAction.java:20 +msgid "" +"Open the annotation preset test tool for previewing annotation preset " +"dialogs." +msgstr "" + +#: ../annotation-tester/src/annotationtester/AnnotationTesterAction.java:28 +msgid "You have to specify annotation sources in the preferences first." +msgstr "" + +#~ msgid "Download {0} ways containing a total of {1} segments?" +#~ msgstr "Download {0} ways containing a total of {1} segments?" + +#~ msgid "Refresh the selection list." +#~ msgstr "Refresh the selection list." + +#~ msgid "Search for objects." +#~ msgstr "Search for objects." + +#~ msgid "Conflicts in disjunct objects" +#~ msgstr "Conflicts in disjunct objects" + +#~ msgid "Downloading {0} {1}" +#~ msgstr "Downloading {0} {1}" + +#~ msgid "Got more than one object when expecting only one." +#~ msgstr "Got more than one object when expecting only one." + #~ msgid "Used in a way." #~ msgstr "Used in a way." @@ -2084,7 +2122,4 @@ #~ msgstr "Show background" -#~ msgid "Download and show landsat background images." -#~ msgstr "Download and show landsat background images." - #~ msgid "Images" #~ msgstr "Images" @@ -2092,10 +2127,4 @@ #~ msgid "Time loop in gps data." #~ msgstr "Time loop in gps data." - -#~ msgid "Wrong longitude transformation for tile cache. Can't operate on {0}" -#~ msgstr "Wrong longitude transformation for tile cache. Can't operate on {0}" - -#~ msgid "WMS layer: {0}" -#~ msgstr "WMS layer: {0}" #~ msgid "OptionPane.okButtonText"