Remove unused osmarender key data

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index d01482045662ce466895f750d5211002604a1f48..8989af3a9ffb59aec9a16d322e5f9429529fa24c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -230,16 +230,16 @@ en:
       manually_select: "Manually select a different area"
       hide_areas: "Hide areas"
       show_areas: "Show areas"
       manually_select: "Manually select a different area"
       hide_areas: "Hide areas"
       show_areas: "Show areas"

-      loaded_an_area_with_num_features: "You have loaded an area which contains [[num_features]] features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than [[max_features]] features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."
+      loaded_an_area_with_num_features: "You have loaded an area which contains %{num_features} features. In general, some browsers may not cope well with displaying this quantity of data. Generally, browsers work best at displaying less than %{max_features} features at a time: doing anything else may make your browser slow/unresponsive. If you are sure you want to display this data, you may do so by clicking the button below."

       load_data: "Load Data"
       load_data: "Load Data"

-      unable_to_load_size: "Unable to load: Bounding box size of [[bbox_size]] is too large (must be smaller than %{max_bbox_size})"
+      unable_to_load_size: "Unable to load: Bounding box size of %{bbox_size} is too large (must be smaller than %{max_bbox_size})"

       loading: "Loading..."
       show_history: "Show History"
       wait: "Wait..."
       loading: "Loading..."
       show_history: "Show History"
       wait: "Wait..."

-      history_for_feature: "History for [[feature]]"
+      history_for_feature: "History for %{feature}"

       details: "Details"
       private_user: "private user"
       details: "Details"
       private_user: "private user"

-      edited_by_user_at_timestamp: "Edited by [[user]] at [[timestamp]]"
+      edited_by_user_at_timestamp: "Edited by %{user} at %{timestamp}"

       object_list:
         heading: "Object list"
         back: "Display object list"
       object_list:
         heading: "Object list"
         back: "Display object list"


@@ -251,13 +251,13 @@ en:
         details: "Details"
         selected:
           type:
         details: "Details"
         selected:
           type:

-            node: "Node [[id]]"
-            way: "Way [[id]]"
+            node: "Node %{id}"
+            way: "Way %{id}"

             # There is no 'relation' type because it is not represented in OpenLayers
         history:
           type:
             # There is no 'relation' type because it is not represented in OpenLayers
         history:
           type:

-            node: "Node [[id]]"
-            way: "Way [[id]]"
+            node: "Node %{id}"
+            way: "Way %{id}"

             # There is no 'relation' type because it is not represented in OpenLayers
     tag_details:
       tags: "Tags:"
             # There is no 'relation' type because it is not represented in OpenLayers
     tag_details:
       tags: "Tags:"


@@ -1742,8 +1742,8 @@ en:
         revoke:
           administrator: "Revoke administrator access"
           moderator: "Revoke moderator access"
         revoke:
           administrator: "Revoke administrator access"
           moderator: "Revoke moderator access"

-      block_history: "view blocks received"
-      moderator_history: "view blocks given"
+      block_history: "blocks received"
+      moderator_history: "blocks given"

       comments: "comments"
       create_block: "block this user"
       activate_user: "activate this user"
       comments: "comments"
       create_block: "block this user"
       activate_user: "activate this user"


@@ -1831,10 +1831,14 @@ en:
     go_public:
       flash success: "All your edits are now public, and you are now allowed to edit."
     make_friend:
     go_public:
       flash success: "All your edits are now public, and you are now allowed to edit."
     make_friend:

+      heading: "Add %{user} as a friend?"
+      button: "Add as friend"

       success: "%{name} is now your friend."
       failed: "Sorry, failed to add %{name} as a friend."
       already_a_friend: "You are already friends with %{name}."
     remove_friend:
       success: "%{name} is now your friend."
       failed: "Sorry, failed to add %{name} as a friend."
       already_a_friend: "You are already friends with %{name}."
     remove_friend:

+      heading: "Remove %{user} as a friend?"
+      button: "Remove as friend"

       success: "%{name} was removed from your friends."
       not_a_friend: "%{name} is not one of your friends."
     filter:
       success: "%{name} was removed from your friends."
       not_a_friend: "%{name} is not one of your friends."
     filter: