Show error messages when something goes wrong with twitter / display a popup if a...

[rails.git] / config / potlatch / locales / en.yml

diff --git a/config/potlatch/locales/en.yml b/config/potlatch/locales/en.yml
index ab7a5bac7d3ff79373820917f5b2132f7f923c9a..e8bd9f59b0dc896f684cea0d8bc696e4d984514a 100644 (file)
--- a/config/potlatch/locales/en.yml
+++ b/config/potlatch/locales/en.yml
@@ -41,6 +41,7 @@ en:
   advice_uploadempty: Nothing to upload
   advice_uploadfail: Upload stopped
   advice_uploadsuccess: All data successfully uploaded
   advice_uploadempty: Nothing to upload
   advice_uploadfail: Upload stopped
   advice_uploadsuccess: All data successfully uploaded

+  advice_twatted: "Twatted your comment to Twitter"

   advice_waydragged: Way dragged (Z to undo)
   cancel: Cancel
   closechangeset: Closing changeset
   advice_waydragged: Way dragged (Z to undo)
   cancel: Cancel
   closechangeset: Closing changeset


@@ -65,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_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: Sorry - posting to Twitter failed.
+  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.
   existingrelation: Add to an existing relation
   findrelation: Find a relation containing
   gpxpleasewait: Please wait while the GPX track is processed.


@@ -125,6 +126,7 @@ en:
   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_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_layer_osmarender: OSM - Osmarender
   option_layer_tip: Choose the background to display
   option_layer_yahoo: Yahoo!


@@ -133,9 +135,9 @@ en:
   option_thinareas: Use thinner lines for areas
   option_thinlines: Use thin lines at all scales
   option_tiger: Highlight unchanged TIGER
   option_thinareas: Use thinner lines for areas
   option_thinlines: Use thin lines at all scales
   option_tiger: Highlight unchanged TIGER

-  option_warnings: Show floating warnings

   option_twitterid: "Twitter name:"
   option_twitterpwd: "Twitter password:"
   option_twitterid: "Twitter name:"
   option_twitterpwd: "Twitter password:"

+  option_warnings: Show floating warnings

   point: Point
   preset_icon_airport: Airport
   preset_icon_bar: Bar
   point: Point
   preset_icon_airport: Airport
   preset_icon_bar: Bar