X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/117b8d1a6ba88251354ca7e31e9c514c3de0daec..26279b55cac5dc889bdfbe276d1127683a15809b:/config/potlatch/locales/en.yml

diff --git a/config/potlatch/locales/en.yml b/config/potlatch/locales/en.yml
index 09ae689c3..90115c49f 100644
--- a/config/potlatch/locales/en.yml
+++ b/config/potlatch/locales/en.yml
@@ -38,10 +38,10 @@ en:
   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_microblogged: Updated your $1 status
   advice_uploadempty: Nothing to upload
   advice_uploadfail: Upload stopped
   advice_uploadsuccess: All data successfully uploaded
-  advice_twatted: "Updated your Twitter status"
   advice_waydragged: Way dragged (Z to undo)
   cancel: Cancel
   closechangeset: Closing changeset
@@ -66,7 +66,7 @@ en:
   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"
+  error_microblog_long: "Posting to $1 failed:\nHTTP code: $2\nError message: $3\n$1 error: $4"
   existingrelation: Add to an existing relation
   findrelation: Find a relation containing
   gpxpleasewait: Please wait while the GPX track is processed.
@@ -106,8 +106,11 @@ en:
   login_title: Couldn't log in
   login_uid: "Username:"
   mail: Mail
+  microblog_name_twitter: Twitter
+  microblog_name_identica: Identi.ca
   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
@@ -123,20 +126,21 @@ en:
   option_layer_cycle_map: OSM - cycle map
   option_layer_maplint: OSM - Maplint (errors)
   option_layer_mapnik: OSM - Mapnik
+  option_layer_nearmap: "Australia: NearMap"
   option_layer_ooc_25k: "UK historic: 1:25k"
   option_layer_ooc_7th: "UK historic: 7th"
   option_layer_ooc_npe: "UK historic: NPE"
-  option_layer_nearmap: "Australia: NearMap"
   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_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_microblog_id: "Microblog name:"
+  option_microblog_pwd: "Microblog password:"
   option_warnings: Show floating warnings
   point: Point
   preset_icon_airport: Airport
@@ -167,6 +171,8 @@ en:
   preset_icon_theatre: Theatre
   preset_tip: Choose from a menu of preset tags describing the $1
   prompt_addtorelation: Add $1 to a relation
+  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_changesetcomment: "Enter a description of your changes:"
   prompt_closechangeset: Close changeset $1
   prompt_createparallel: Create parallel way
@@ -178,7 +184,7 @@ en:
   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_microblog: Post to $1 ($2 left)
   prompt_unlock: Click to unlock
   prompt_welcome: Welcome to OpenStreetMap!
   retry: Retry
@@ -210,4 +216,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