X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/9bf35dbcfb533711aa4d6abe8d8c88147edd9176..c0fe77fd020a102ee0ac3cde974b437f31efc817:/config/potlatch/locales/en.yml diff --git a/config/potlatch/locales/en.yml b/config/potlatch/locales/en.yml index 613d56556..9da6d565e 100644 --- a/config/potlatch/locales/en.yml +++ b/config/potlatch/locales/en.yml @@ -31,6 +31,7 @@ en: advanced_tooltip: Advanced editing actions advanced_undelete: Undelete advice_bendy: Too bendy to straighten (SHIFT to force) + advice_conflict: Server conflict - you may need to try saving again advice_deletingpoi: Deleting POI (Z to undo) advice_deletingway: Deleting way (Z to undo) advice_microblogged: Updated your $1 status @@ -59,7 +60,7 @@ en: drag_pois: Drag and drop points of interest editinglive: Editing live editingoffline: Editing offline - emailauthor: \n\nPlease e-mail richard\@systemeD.net with a bug report, saying what you were doing at the time. + emailauthor: \n\nPlease e-mail richard@systemeD.net with a bug report, saying what you were doing at the time. error_anonymous: You cannot contact an anonymous mapper. error_connectionfailed: Sorry - the connection to the OpenStreetMap server failed. Any recent changes have not been saved.\n\nWould you like to try again? error_microblog_long: "Posting to $1 failed:\nHTTP code: $2\nError message: $3\n$1 error: $4" @@ -78,7 +79,7 @@ en: heading_tagging: Tagging heading_troubleshooting: Troubleshooting help: Help - help_html: "Welcome to Potlatch\nPotlatch is the easy-to-use editor for OpenStreetMap. Draw roads, paths, landmarks and shops from your GPS surveys, satellite imagery or old maps.\n\nThese help pages will take you through the basics of using Potlatch, and tell you where to find out more. Click the headings above to begin.\n\nWhen you've finished, just click anywhere else on the page.\n\n\n\nUseful stuff to know\nDon't copy from other maps! \n\nIf you choose 'Edit live', any changes you make will go into the database as you draw them - like, immediately. If you're not so confident, choose 'Edit with save', and they'll only go in when you press 'Save'.\n\nAny edits you make will usually be shown on the map after an hour or two (a few things take a week). Not everything is shown on the map - it would look too messy. But because OpenStreetMap's data is open source, other people are free to make maps showing different aspects - like OpenCycleMap or Midnight Commander.\n\nRemember it's both a good-looking map (so draw pretty curves for bends) and a diagram (so make sure roads join at junctions).\n\nDid we mention about not copying from other maps?\n\n\nFind out more\nPotlatch manual\nMailing lists\nOnline chat (live help)\nWeb forum\nCommunity wiki\nPotlatch source-code\n\n\n\nGetting started\nNow that you have Potlatch open, click 'Edit with save' to get started.\n\t\nSo you're ready to draw a map. The easiest place to start is by putting some points of interest on the map - or \"POIs\". These might be pubs, churches, railway stations... anything you like.\n\nDrag and drop\nTo make it super-easy, you'll see a selection of the most common POIs, right at the bottom of the map for you. Putting one on the map is as easy as dragging it from there onto the right place on the map. And don't worry if you don't get the position right first time: you can drag it again until it's right. Note that the POI is highlighted in yellow to show that it's selected.\n\t\nOnce you've done that, you'll want to give your pub (or church, or station) a name. You'll see that a little table has appeared at the bottom. One of the entries will say \"name\" followed by \"(type name here)\". Do that - click that text, and type the name.\n\nClick somewhere else on the map to deselect your POI, and the colourful little panel returns.\n\nEasy, isn't it? Click 'Save' (bottom right) when you're done.\nMoving around\nTo move to a different part of the map, just drag an empty area. Potlatch will automatically load the new data (look at the top right).\n\nWe told you to 'Edit with save', but you can also click 'Edit live'. If you do this, your changes will go into the database straightaway, so there's no 'Save' button. This is good for quick changes and mapping parties.\n\nNext steps\nHappy with all of that? Great. Click 'Surveying' above to find out how to become a real mapper!\n\nSurveying with a GPS\nThe idea behind OpenStreetMap is to make a map without the restrictive copyright of other maps. This means you can't copy from elsewhere: you must go and survey the streets yourself. Fortunately, it's lots of fun!\n\t\nThe best way to do this is with a handheld GPS set. Find an area that isn't mapped yet, then walk or cycle up the streets with your GPS switched on. Note the street names, and anything else interesting (pubs? churches?) , as you go along.\n\nWhen you get home, your GPS will contain a 'tracklog' recording everywhere you've been. You can then upload this to OpenStreetMap.\n\nThe best type of GPS is one that records to the tracklog frequently (every second or two) and has a big memory. Lots of our mappers use handheld Garmins or little Bluetooth units. There are detailed GPS Reviews on our wiki.\nUploading your track\nNow, you need to get your track off the GPS set. Maybe your GPS came with some software, or maybe it lets you copy the files off via USB. If not, try GPSBabel. Whatever, you want the file to be in GPX format.\n\nThen use the 'GPS Traces' tab to upload your track to OpenStreetMap. But this is only the first bit - it won't appear on the map yet. You must draw and name the roads yourself, using the track as a guide.\nUsing your track\nFind your uploaded track in the 'GPS Traces' listing, and click 'edit' right next to it. Potlatch will start with this track loaded, plus any waypoints. You're ready to draw!\n\n

You can also click this button to show everyone's GPS tracks (but not waypoints) for the current area. Hold Shift to show just your tracks.\nUsing satellite photos\nIf you don't have a GPS, don't worry. In some cities, we have satellite photos you can trace over, kindly supplied by Yahoo! (thanks!). Go out and note the street names, then come back and trace over the lines.\n\n

If you don't see the satellite imagery, click the options button and make sure 'Yahoo!' is selected. If you still don't see it, it's probably not available for your city, or you might need to zoom out a bit.\n\nOn this same options button you'll find a few other choices like an out-of-copyright map of the UK, and OpenTopoMap for the US. These are all specially selected because we're allowed to use them - don't copy from anyone else's maps or aerial photos. (Copyright law sucks.)\n\nSometimes satellite pics are a bit displaced from where the roads really are. If you find this, hold Space and drag the background until it lines up. Always trust GPS tracks over satellite pics.\n\nDrawing ways\nTo draw a road (or 'way') starting at a blank space on the map, just click there; then at each point on the road in turn. When you've finished, double-click or press Enter - then click somewhere else to deselect the road.\n\nTo draw a way starting from another way, click that road to select it; its points will appear red. Hold Shift and click one of them to start a new way at that point. (If there's no red point at the junction, shift-click where you want one!)\n\nClick 'Save' (bottom right) when you're done. Save often, in case the server has problems.\n\nDon't expect your changes to show instantly on the main map. It usually takes an hour or two, sometimes up to a week.\nMaking junctions\nIt's really important that, where two roads join, they share a point (or 'node'). Route-planners use this to know where to turn.\n\t\nPotlatch takes care of this as long as you are careful to click exactly on the way you're joining. Look for the helpful signs: the points light up blue, the pointer changes, and when you're done, the junction point has a black outline.\nMoving and deleting\nThis works just as you'd expect it to. To delete a point, select it and press Delete. To delete a whole way, press Shift-Delete.\n\nTo move something, just drag it. (You'll have to click and hold for a short while before dragging a way, so you don't do it by accident.)\nMore advanced drawing\n

If two parts of a way have different names, you'll need to split them. Click the way; then click the point where it should be split, and click the scissors. (You can merge ways by clicking with Control, or the Apple key on a Mac, but don't merge two roads of different names or types.)\n\t\n

Roundabouts are really hard to draw right. Don't worry - Potlatch can help. Just draw the loop roughly, making sure it joins back on itself at the end, then click this icon to 'tidy' it. (You can also use this to straighten out roads.)\nPoints of interest\nThe first thing you learned was how to drag-and-drop a point of interest. You can also create one by double-clicking on the map: a green circle appears. But how to say whether it's a pub, a church or what? Click 'Tagging' above to find out!\n\nWhat type of road is it?\nOnce you've drawn a way, you should say what it is. Is it a major road, a footpath or a river? What's its name? Are there any special rules (e.g. \"no bicycles\")?\n\nIn OpenStreetMap, you record this using 'tags'. A tag has two parts, and you can have as many as you like. For example, you could add highway | trunk to say it's a major road; highway | residential for a road on a housing estate; or highway | footway for a footpath. If bikes were banned, you could then add bicycle | no. Then to record its name, add name | Market Street.\n\nThe tags in Potlatch appear at the bottom of the screen - click an existing road, and you'll see what tags it has. Click the '+' sign (bottom right) to add a new tag. The 'x' by each tag deletes it.\n\nYou can tag whole ways; points in ways (maybe a gate or a traffic light); and points of interest.\nUsing preset tags\nTo get you started, Potlatch has ready-made presets containing the most popular tags.\n\n

Select a way, then click through the symbols until you find a suitable one. Then, choose the most appropriate option from the menu.\n\nThis will fill the tags in. Some will be left partly blank so you can type in (for example) the road name and number.\nOne-way roads\nYou might want to add a tag like oneway | yes - but how do you say which direction? There's an arrow in the bottom left that shows the way's direction, from start to end. Click it to reverse.\nChoosing your own tags\nOf course, you're not restricted to just the presets. By using the '+' button, you can use any tags at all.\n\nYou can see what tags other people use at OSMdoc, and there is a long list of popular tags on our wiki called Map Features. But these are only suggestions, not rules. You are free to invent your own tags or borrow from others.\n\nBecause OpenStreetMap data is used to make many different maps, each map will show (or 'render') its own choice of tags.\nRelations\nSometimes tags aren't enough, and you need to 'group' two or more ways. Maybe a turn is banned from one road into another, or 20 ways together make up a signed cycle route. You can do this with an advanced feature called 'relations'. Find out more on the wiki.\n\nUndoing mistakes\n

This is the undo button (you can also press Z) - it will undo the last thing you did.\n\nYou can 'revert' to a previously saved version of a way or point. Select it, then click its ID (the number at the bottom left) - or press H (for 'history'). You'll see a list of everyone who's edited it, and when. Choose the one to go back to, and click Revert.\n\nIf you've accidentally deleted a way and saved it, press U (for 'undelete'). All the deleted ways will be shown. Choose the one you want; unlock it by clicking the red padlock; and save as usual.\n\nThink someone else has made a mistake? Send them a friendly message. Use the history option (H) to select their name, then click 'Mail'.\n\nUse the Inspector (in the 'Advanced' menu) for helpful information about the current way or point.\nFAQs\nHow do I see my waypoints?\nWaypoints only show up if you click 'edit' by the track name in 'GPS Traces'. The file has to have both waypoints and tracklog in it - the server rejects anything with waypoints alone.\n\nMore FAQs for Potlatch and OpenStreetMap.\n\n\n\nWorking faster\nThe further out you're zoomed, the more data Potlatch has to load. Zoom in before clicking 'Edit'.\n\nTurn off 'Use pen and hand pointers' (in the options window) for maximum speed.\n\nIf the server is running slowly, come back later. Check the wiki for known problems. Some times, like Sunday evenings, are always busy.\n\nTell Potlatch to memorise your favourite sets of tags. Select a way or point with those tags, then press Ctrl, Shift and a number from 1 to 9. Then, to apply those tags again, just press Shift and that number. (They'll be remembered every time you use Potlatch on this computer.)\n\nTurn your GPS track into a way by finding it in the 'GPS Traces' list, clicking 'edit' by it, then tick the 'convert' box. It'll be locked (red) so won't save. Edit it first, then click the red padlock to unlock when ready to save.\n\nWhat to click\nDrag the map to move around.\nDouble-click to create a new POI.\nSingle-click to start a new way.\nHold and drag a way or POI to move it.\nWhen drawing a way\nDouble-click or press Enter to finish drawing.\nClick another way to make a junction.\nShift-click the end of another way to merge.\nWhen a way is selected\nClick a point to select it.\nShift-click in the way to insert a new point.\nShift-click a point to start a new way from there.\nControl-click another way to merge.\n\nKeyboard shortcuts\nB\tAdd background source tag\nC\tClose changeset\nG\tShow GPS tracks\nH\tShow history\nI\tShow inspector\nJ\tJoin point to crossing ways\nK\tLock/unlock current selection\nL\tShow current latitude/longitude\nM\tMaximise editing window\nP\tCreate parallel way\nR\tRepeat tags\nS\tSave (unless editing live)\nT\tTidy into straight line/circle\nU\tUndelete (show deleted ways)\nX\tCut way in two\nZ\tUndo\n-\tRemove point from this way only\n+\tAdd new tag\n/\tSelect another way sharing this point\nDelete\tDelete point\n (+Shift)\tDelete entire way\nReturn\tFinish drawing line\nSpace\tHold and drag background\nEsc\tAbort this edit; reload from server\n0\tRemove all tags\n1-9\tSelect preset tags\n (+Shift)\tSelect memorised tags\n (+S/Ctrl)\tMemorise tags\nÂ§ or `\tCycle between tag groups\n" + help_html: "Welcome to Potlatch\nPotlatch is the easy-to-use editor for OpenStreetMap. Draw roads, paths, landmarks and shops from your GPS surveys, satellite imagery or old maps.\n\nThese help pages will take you through the basics of using Potlatch, and tell you where to find out more. Click the headings above to begin.\n\nWhen you've finished, just click anywhere else on the page.\n\n\n\nUseful stuff to know\nDon't copy from other maps! \n\nIf you choose 'Edit live', any changes you make will go into the database as you draw them - like, immediately. If you're not so confident, choose 'Edit with save', and they'll only go in when you press 'Save'.\n\nAny edits you make will usually be shown on the map after an hour or two (a few things take a week). Not everything is shown on the map - it would look too messy. But because OpenStreetMap's data is open source, other people are free to make maps showing different aspects - like OpenCycleMap or Midnight Commander.\n\nRemember it's both a good-looking map (so draw pretty curves for bends) and a diagram (so make sure roads join at junctions).\n\nDid we mention about not copying from other maps?\n\n\nFind out more\nPotlatch manual\nMailing lists\nOnline chat (live help)\nWeb forum\nCommunity wiki\nPotlatch source-code\n\n\n\nGetting started\nNow that you have Potlatch open, click 'Edit with save' to get started.\n\t\nSo you're ready to draw a map. The easiest place to start is by putting some points of interest on the map - or \"POIs\". These might be pubs, churches, railway stations... anything you like.\n\nDrag and drop\nTo make it super-easy, you'll see a selection of the most common POIs, right at the bottom of the map for you. Putting one on the map is as easy as dragging it from there onto the right place on the map. And don't worry if you don't get the position right first time: you can drag it again until it's right. Note that the POI is highlighted in yellow to show that it's selected.\n\t\nOnce you've done that, you'll want to give your pub (or church, or station) a name. You'll see that a little table has appeared at the bottom. One of the entries will say \"name\" followed by \"(type name here)\". Do that - click that text, and type the name.\n\nClick somewhere else on the map to deselect your POI, and the colourful little panel returns.\n\nEasy, isn't it? Click 'Save' (bottom right) when you're done.\nMoving around\nTo move to a different part of the map, just drag an empty area. Potlatch will automatically load the new data (look at the top right).\n\nWe told you to 'Edit with save', but you can also click 'Edit live'. If you do this, your changes will go into the database straightaway, so there's no 'Save' button. This is good for quick changes and mapping parties.\n\nNext steps\nHappy with all of that? Great. Click 'Surveying' above to find out how to become a real mapper!\n\nSurveying with a GPS\nThe idea behind OpenStreetMap is to make a map without the restrictive copyright of other maps. This means you can't copy from elsewhere: you must go and survey the streets yourself. Fortunately, it's lots of fun!\n\t\nThe best way to do this is with a handheld GPS set. Find an area that isn't mapped yet, then walk or cycle up the streets with your GPS switched on. Note the street names, and anything else interesting (pubs? churches?) , as you go along.\n\nWhen you get home, your GPS will contain a 'tracklog' recording everywhere you've been. You can then upload this to OpenStreetMap.\n\nThe best type of GPS is one that records to the tracklog frequently (every second or two) and has a big memory. Lots of our mappers use handheld Garmins or little Bluetooth units. There are detailed GPS Reviews on our wiki.\nUploading your track\nNow, you need to get your track off the GPS set. Maybe your GPS came with some software, or maybe it lets you copy the files off via USB. If not, try GPSBabel. Whatever, you want the file to be in GPX format.\n\nThen use the 'GPS Traces' tab to upload your track to OpenStreetMap. But this is only the first bit - it won't appear on the map yet. You must draw and name the roads yourself, using the track as a guide.\nUsing your track\nFind your uploaded track in the 'GPS Traces' listing, and click 'edit' right next to it. Potlatch will start with this track loaded, plus any waypoints. You're ready to draw!\n\n

This is the undo button (you can also press Z) - it will undo the last thing you did.\n\nYou can 'revert' to a previously saved version of a way or point. Select it, then click its ID (the number at the bottom left) - or press H (for 'history'). You'll see a list of everyone who's edited it, and when. Choose the one to go back to, and click Revert.\n\nIf you've accidentally deleted a way and saved it, press U (for 'undelete'). All the deleted ways will be shown. Choose the one you want; unlock it by clicking the red padlock; and save as usual.\n\nThink someone else has made a mistake? Send them a friendly message. Use the history option (H) to select their name, then click 'Mail'.\n\nUse the Inspector (in the 'Advanced' menu) for helpful information about the current way or point.\nFAQs\nHow do I see my waypoints?\nWaypoints only show up if you click 'edit' by the track name in 'GPS Traces'. The file has to have both waypoints and tracklog in it - the server rejects anything with waypoints alone.\n\nMore FAQs for Potlatch and OpenStreetMap.\n\n\n\nWorking faster\nThe further out you're zoomed, the more data Potlatch has to load. Zoom in before clicking 'Edit'.\n\nTurn off 'Use pen and hand pointers' (in the options window) for maximum speed.\n\nIf the server is running slowly, come back later. Check the wiki for known problems. Some times, like Sunday evenings, are always busy.\n\nTell Potlatch to memorise your favourite sets of tags. Select a way or point with those tags, then press Ctrl, Shift and a number from 1 to 9. Then, to apply those tags again, just press Shift and that number. (They'll be remembered every time you use Potlatch on this computer.)\n\nTurn your GPS track into a way by finding it in the 'GPS Traces' list, clicking 'edit' by it, then tick the 'convert' box. It'll be locked (red) so won't save. Edit it first, then click the red padlock to unlock when ready to save.\n\nWhat to click\nDrag the map to move around.\nDouble-click to create a new POI.\nSingle-click to start a new way.\nHold and drag a way or POI to move it.\nWhen drawing a way\nDouble-click or press Enter to finish drawing.\nClick another way to make a junction.\nShift-click the end of another way to merge.\nWhen a way is selected\nClick a point to select it.\nShift-click in the way to insert a new point.\nShift-click a point to start a new way from there.\nControl-click another way to merge.\n\nKeyboard shortcuts\nB\tAdd background source tag\nC\tClose changeset\nG\tShow GPS tracks\nH\tShow history\nI\tShow inspector\nJ\tJoin point to what's below ways\n (+Shift)\tUnjoin from other ways\nK\tLock/unlock current selection\nL\tShow current latitude/longitude\nM\tMaximise editing window\nP\tCreate parallel way\nR\tRepeat tags\nS\tSave (unless editing live)\nT\tTidy into straight line/circle\nU\tUndelete (show deleted ways)\nX\tCut way in two\nZ\tUndo\n-\tRemove point from this way only\n+\tAdd new tag\n/\tSelect another way sharing this point\nDelete\tDelete point\n (+Shift)\tDelete entire way\nReturn\tFinish drawing line\nSpace\tHold and drag background\nEsc\tAbort this edit; reload from server\n0\tRemove all tags\n1-9\tSelect preset tags\n (+Shift)\tSelect memorised tags\n (+S/Ctrl)\tMemorise tags\nÂ§ or `\tCycle between tag groups\n" hint_drawmode: click to add point\ndouble-click/Return\nto end line hint_latlon: "lat $1\nlon $2" hint_loading: loading data @@ -88,6 +89,7 @@ en: hint_saving: saving data hint_saving_loading: loading/saving data inspector: Inspector + inspector_duplicate: Duplicate of inspector_in_ways: In ways inspector_latlon: "Lat $1\nLon $2" inspector_locked: Locked @@ -101,6 +103,7 @@ en: inspector_way_name: $1 ($2) inspector_way_nodes: $1 nodes inspector_way_nodes_closed: $1 nodes (closed) + loading: Loading... login_pwd: "Password:" login_retry: Your site login was not recognised. Please try again. login_title: Couldn't log in @@ -124,13 +127,19 @@ en: option_external: "External launch:" option_fadebackground: Fade background option_layer_cycle_map: OSM - cycle map + option_layer_geoeye_gravitystorm_haiti: "Haiti: GeoEye Jan 13" + option_layer_geoeye_nypl_haiti: "Haiti: GeoEye Jan 13+" + option_layer_digitalglobe_haiti: "Haiti: DigitalGlobe" + option_layer_streets_haiti: "Haiti: street names" option_layer_maplint: OSM - Maplint (errors) option_layer_mapnik: OSM - Mapnik option_layer_nearmap: "Australia: NearMap" - option_layer_geoeye_haiti: "Haiti: GeoEye" option_layer_ooc_25k: "UK historic: 1:25k" option_layer_ooc_7th: "UK historic: 7th" option_layer_ooc_npe: "UK historic: NPE" + option_layer_ooc_scotland: "UK historic: Scotland" + option_layer_os_streetview: "UK: OS StreetView" + option_layer_surrey_air_survey: "UK: Surrey Air Survey" option_layer_osmarender: OSM - Osmarender option_layer_tip: Choose the background to display option_layer_yahoo: Yahoo! @@ -150,6 +159,7 @@ en: preset_icon_cafe: Cafe preset_icon_cinema: Cinema preset_icon_convenience: Convenience shop + preset_icon_disaster: Haiti building preset_icon_fast_food: Fast food preset_icon_ferry_terminal: Ferry preset_icon_fire_station: Fire station @@ -184,13 +194,19 @@ en: prompt_microblog: Post to $1 ($2 left) prompt_revertversion: "Revert to an earlier saved version:" prompt_savechanges: Save changes - prompt_taggedpoints: Some of the points on this way are tagged. Really delete? + prompt_taggedpoints: Some of the points on this way are tagged or in relations. Really delete? prompt_track: Convert GPS track to ways prompt_unlock: Click to unlock prompt_welcome: Welcome to OpenStreetMap! retry: Retry revert: Revert save: Save + tags_findtag: Find tag + tags_findatag: Find a tag + tags_typesearchterm: "Type a word to look for:" + tags_matching: Popular tags matching '$1' + tags_descriptions: Descriptions of '$1' + tags_backtolist: Back to list tip_addrelation: Add to a relation tip_addtag: Add a new tag tip_alert: An error occurred - click for details