X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/f0b39503ef16b7225711c760dc4955ed907d41fa..9bf35dbcfb533711aa4d6abe8d8c88147edd9176:/config/potlatch/locales/en.yml

diff --git a/config/potlatch/locales/en.yml b/config/potlatch/locales/en.yml
index 02df5717b..613d56556 100644
--- a/config/potlatch/locales/en.yml
+++ b/config/potlatch/locales/en.yml
@@ -33,12 +33,12 @@ en:
   advice_bendy: Too bendy to straighten (SHIFT to force)
   advice_deletingpoi: Deleting POI (Z to undo)
   advice_deletingway: Deleting way (Z to undo)
+  advice_microblogged: Updated your $1 status
   advice_nocommonpoint: The ways do not share a common point
   advice_revertingpoi: Reverting to last saved POI (Z to undo)
   advice_revertingway: Reverting to last saved way (Z to undo)
   advice_tagconflict: Tags don't match - please check (Z to undo)
   advice_toolong: Too long to unlock - please split into shorter ways
-  advice_twatted: Updated your Twitter status
   advice_uploadempty: Nothing to upload
   advice_uploadfail: Upload stopped
   advice_uploadsuccess: All data successfully uploaded
@@ -62,11 +62,11 @@ en:
   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"
   error_nopoi: The POI cannot be found (perhaps you've panned away?) so I can't undo.
   error_nosharedpoint: Ways $1 and $2 don't share a common point any more, so I can't undo the split.
   error_noway: Way $1 cannot be found (perhaps you've panned away?) so I can't undo.
   error_readfailed: Sorry - the OpenStreetMap server didn't respond when asked for data.\n\nWould you like to try again?
-  error_twitter_long: "Posting to Twitter failed:\nHTTP code: $1\nError message: $2\nTwitter error: $3"
   existingrelation: Add to an existing relation
   findrelation: Find a relation containing
   gpxpleasewait: Please wait while the GPX track is processed.
@@ -89,7 +89,7 @@ en:
   hint_saving_loading: loading/saving data
   inspector: Inspector
   inspector_in_ways: In ways
-  inspector_latlon: "Lat $1\nLon $2\n" # FIXME: twn does not like leading whitespace.
+  inspector_latlon: "Lat $1\nLon $2"
   inspector_locked: Locked
   inspector_node_count: ($1 times)
   inspector_not_in_any_ways: Not in any ways (POI)
@@ -106,8 +106,11 @@ en:
   login_title: Couldn't log in
   login_uid: "Username:"
   mail: Mail
+  microblog_name_identica: Identi.ca
+  microblog_name_twitter: Twitter
   more: More
   newchangeset: "\nPlease try again: Potlatch will start a new changeset."
+  "no": 'No'
   nobackground: No background
   norelations: No relations in current area
   offset_broadcanal: Broad canal towpath
@@ -124,19 +127,21 @@ en:
   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_osmarender: OSM - Osmarender
   option_layer_tip: Choose the background to display
   option_layer_yahoo: Yahoo!
+  option_limitways: Warn when loading lots of data
+  option_microblog_id: "Microblog name:"
+  option_microblog_pwd: "Microblog password:"
   option_noname: Highlight unnamed roads
   option_photo: "Photo KML:"
   option_thinareas: Use thinner lines for areas
   option_thinlines: Use thin lines at all scales
   option_tiger: Highlight unchanged TIGER
-  option_twitterid: "Twitter name:"
-  option_twitterpwd: "Twitter password:"
   option_warnings: Show floating warnings
   point: Point
   preset_icon_airport: Airport
@@ -174,11 +179,13 @@ en:
   prompt_editsave: Edit with save
   prompt_helpavailable: New user? Look in the bottom left for help.
   prompt_launch: Launch external URL
+  prompt_live: In live mode, every item you change will be saved in the OpenStreetMap database instantly - it's not recommended for beginners. Are you sure?
+  prompt_manyways: This area is very detailed and will take a long time to load. Would you prefer to zoom in?
+  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_track: Convert GPS track to ways
-  prompt_twitter: Post to Twitter ($1 left)
   prompt_unlock: Click to unlock
   prompt_welcome: Welcome to OpenStreetMap!
   retry: Retry
@@ -210,4 +217,6 @@ en:
   uploading_relation_name: Uploading relation $1, $2
   uploading_way: Uploading way $1
   uploading_way_name: Uploading way $1, $2
+  warning: Warning!
   way: Way
+  "yes": 'Yes'