Fixup make_friend and remove_friend properly

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index d5577ff6486cd75a53ff1e5898093f3deb4b26f3..34104a7d126b3ec9021e62763f61d91a3e7fe2c8 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -94,7 +94,6 @@ en:
     changeset:
       title: "Changeset"
       changeset: "Changeset: %{id}"
     changeset:
       title: "Changeset"
       changeset: "Changeset: %{id}"

-      download: "Download %{changeset_xml_link} or %{osmchange_xml_link}"

       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
       feed:
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
       feed:


@@ -168,16 +167,14 @@ en:
     node_history:
       node_history: "Node History"
       node_history_title: "Node History: %{node_name}"
     node_history:
       node_history: "Node History"
       node_history_title: "Node History: %{node_name}"

-      download: "%{download_xml_link} or %{view_details_link}"

       download_xml: "Download XML"
       download_xml: "Download XML"

-      view_details: "view details"
+      view_details: "View details"

     node:
       node: "Node"
       node_title: "Node: %{node_name}"
     node:
       node: "Node"
       node_title: "Node: %{node_name}"

-      download: "%{download_xml_link}, %{view_history_link} or %{edit_link}"

       download_xml: "Download XML"
       download_xml: "Download XML"

-      view_history: "view history"
-      edit: "edit"
+      view_history: "View history"
+      edit: "Edit node"

     not_found:
       sorry: "Sorry, the %{type} with the id %{id}, could not be found."
       type:
     not_found:
       sorry: "Sorry, the %{type} with the id %{id}, could not be found."
       type:


@@ -208,9 +205,8 @@ en:
     relation_history:
       relation_history: "Relation History"
       relation_history_title: "Relation History: %{relation_name}"
     relation_history:
       relation_history: "Relation History"
       relation_history_title: "Relation History: %{relation_name}"

-      download: "%{download_xml_link} or %{view_details_link}"

       download_xml: "Download XML"
       download_xml: "Download XML"

-      view_details: "view details"
+      view_details: "View details"

     relation_member:
       entry: "%{type} %{name}"
       entry_role: "%{type} %{name} as %{role}"
     relation_member:
       entry: "%{type} %{name}"
       entry_role: "%{type} %{name} as %{role}"


@@ -221,9 +217,8 @@ en:
     relation:
       relation: "Relation"
       relation_title: "Relation: %{relation_name}"
     relation:
       relation: "Relation"
       relation_title: "Relation: %{relation_name}"

-      download: "%{download_xml_link} or %{view_history_link}"

       download_xml: "Download XML"
       download_xml: "Download XML"

-      view_history: "view history"
+      view_history: "View history"

     start:
       view_data: "View data for current map view"
       manually_select: "Manually select a different area"
     start:
       view_data: "View data for current map view"
       manually_select: "Manually select a different area"


@@ -235,7 +230,7 @@ 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 100 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"
       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..."
       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})"
       loading: "Loading..."


@@ -279,16 +274,14 @@ en:
     way_history:
       way_history: "Way History"
       way_history_title: "Way History: %{way_name}"
     way_history:
       way_history: "Way History"
       way_history_title: "Way History: %{way_name}"

-      download: "%{download_xml_link} or %{view_details_link}"

       download_xml: "Download XML"
       download_xml: "Download XML"

-      view_details: "view details"
+      view_details: "View details"

     way:
       way: "Way"
       way_title: "Way: %{way_name}"
     way:
       way: "Way"
       way_title: "Way: %{way_name}"

-      download: "%{download_xml_link}, %{view_history_link} or %{edit_link}"

       download_xml: "Download XML"
       download_xml: "Download XML"

-      view_history: "view history"
-      edit: "edit"
+      view_history: "View history"
+      edit: "Edit way"

   changeset:
     changeset_paging_nav:
       showing_page: "Showing page %{page}"
   changeset:
     changeset_paging_nav:
       showing_page: "Showing page %{page}"


@@ -328,6 +321,8 @@ en:
       description_user_bbox: "Changesets by %{user} within %{bbox}"
       description_friend: "Changesets by your friends"
       description_nearby: "Changesets by nearby users"
       description_user_bbox: "Changesets by %{user} within %{bbox}"
       description_friend: "Changesets by your friends"
       description_nearby: "Changesets by nearby users"

+      empty_user_html: "It looks you haven't made any edits yet. To get started, check out the <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.3'>Beginners Guide</a>."
+      empty_anon_html: "No edits made yet"

     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."
   diary_entry:
     timeout:
       sorry: "Sorry, the list of changesets you requested took too long to retrieve."
   diary_entry:


@@ -400,7 +395,7 @@ en:
       post: Post
       when: When
       comment: Comment
       post: Post
       when: When
       comment: Comment

-      ago: %{ago} ago
+      ago: "%{ago} ago"

       newer_comments: "Newer Comments"
       older_comments: "Older Comments"
   export:
       newer_comments: "Newer Comments"
       older_comments: "Older Comments"
   export:


@@ -953,7 +948,7 @@ en:
     welcome_user_link_tooltip: Your user page
     home: home
     home_tooltip: Go to home location
     welcome_user_link_tooltip: Your user page
     home: home
     home_tooltip: Go to home location

-    inbox: "inbox (%{count})"
+    inbox_html: "inbox %{count}"

     inbox_tooltip:
       zero: Your inbox contains no unread messages
       one: Your inbox contains 1 unread message
     inbox_tooltip:
       zero: Your inbox contains no unread messages
       one: Your inbox contains 1 unread message


@@ -1008,7 +1003,7 @@ en:
     community_blogs_title: "Blogs from members of the OpenStreetMap community"
     foundation: Foundation
     foundation_title: The OpenStreetMap Foundation
     community_blogs_title: "Blogs from members of the OpenStreetMap community"
     foundation: Foundation
     foundation_title: The OpenStreetMap Foundation

-    sotm2011: 'Come to the 2011 OpenStreetMap Conference, The State of the Map, September 9-11th in Denver!'
+    sotm2012: 'Come to the 2012 OpenStreetMap Conference, The State of the Map, September 6-8th in Tokyo!'

     license:
       alt: CC BY-SA 2.0
       title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License
     license:
       alt: CC BY-SA 2.0
       title: OpenStreetMap data is licensed under the Creative Commons Attribution-Share Alike 2.0 Generic License


@@ -1026,14 +1021,13 @@ en:
       text: You are viewing the English version of the copyright page. You can go back to the %{native_link} of this page or you can stop reading about copyright and %{mapping_link}.
       native_link: THIS_LANGUAGE_NAME_HERE version
       mapping_link: start mapping
       text: You are viewing the English version of the copyright page. You can go back to the %{native_link} of this page or you can stop reading about copyright and %{mapping_link}.
       native_link: THIS_LANGUAGE_NAME_HERE version
       mapping_link: start mapping

-    legal_babble: |
-      <h2>Copyright and License</h2>
-      <p>
-         OpenStreetMap is <i>open data</i>, licensed under the <a
-         href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
-         Commons Attribution-ShareAlike 2.0</a> licence (CC BY-SA).
-      </p>
-      <p>
+    legal_babble:
+      title_html: Copyright and License
+      intro_1_html: |
+        OpenStreetMap is <i>open data</i>, licensed under the <a
+        href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
+        Commons Attribution-ShareAlike 2.0</a> licence (CC BY-SA).
+      intro_2_html: |

         You are free to copy, distribute, transmit and adapt our maps
         and data, as long as you credit OpenStreetMap and its
         contributors. If you alter or build upon our maps or data, you
         You are free to copy, distribute, transmit and adapt our maps
         and data, as long as you credit OpenStreetMap and its
         contributors. If you alter or build upon our maps or data, you


@@ -1041,17 +1035,14 @@ en:
         full <a
         href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">legal
         code</a> explains your rights and responsibilities.
         full <a
         href="http://creativecommons.org/licenses/by-sa/2.0/legalcode">legal
         code</a> explains your rights and responsibilities.

-      </p>
-
-      <h3>How to credit OpenStreetMap</h3>
-      <p>
+      credit_title_html: How to credit OpenStreetMap
+      credit_1_html: |

         If you are using OpenStreetMap map images, we request that
         your credit reads at least &ldquo;&copy; OpenStreetMap
         contributors, CC BY-SA&rdquo;. If you are using map data only,
         we request &ldquo;Map data &copy; OpenStreetMap contributors,
         CC BY-SA&rdquo;.
         If you are using OpenStreetMap map images, we request that
         your credit reads at least &ldquo;&copy; OpenStreetMap
         contributors, CC BY-SA&rdquo;. If you are using map data only,
         we request &ldquo;Map data &copy; OpenStreetMap contributors,
         CC BY-SA&rdquo;.

-      </p>
-      <p>
+      credit_2_html: |

         Where possible, OpenStreetMap should be hyperlinked to <a
         href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a>
         and CC BY-SA to <a
         Where possible, OpenStreetMap should be hyperlinked to <a
         href="http://www.openstreetmap.org/">http://www.openstreetmap.org/</a>
         and CC BY-SA to <a


@@ -1061,30 +1052,23 @@ en:
         www.openstreetmap.org (perhaps by expanding
         &lsquo;OpenStreetMap&rsquo; to this full address) and to
         www.creativecommons.org.
         www.openstreetmap.org (perhaps by expanding
         &lsquo;OpenStreetMap&rsquo; to this full address) and to
         www.creativecommons.org.

-      </p>
-
-      <h3>Finding out more</h3>
-      <p>
+      more_title_html: Finding out more
+      more_1_html: |

         Read more about using our data at the <a
         href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
         FAQ</a>.
         Read more about using our data at the <a
         href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
         FAQ</a>.

-      </p>
-      <p>
+      more_2_html: |

         OSM contributors are reminded never to add data from any
         copyrighted sources (e.g. Google Maps or printed maps) without
         explicit permission from the copyright holders.
         OSM contributors are reminded never to add data from any
         copyrighted sources (e.g. Google Maps or printed maps) without
         explicit permission from the copyright holders.

-      </p>
-      <p>
+      more_3_html: |

         Although OpenStreetMap is open data, we cannot provide a
         free-of-charge map API for third-party developers.
         Although OpenStreetMap is open data, we cannot provide a
         free-of-charge map API for third-party developers.

-

         See our <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">API Usage Policy</a>,
         <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Tile Usage Policy</a>
         and <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim Usage Policy</a>.
         See our <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">API Usage Policy</a>,
         <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Tile Usage Policy</a>
         and <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim Usage Policy</a>.

-      </p>
-
-      <h3>Our contributors</h3>
-      <p>
+      contributors_title_html: Our contributors
+      contributors_intro_html: |

         Our CC BY-SA licence requires you to &ldquo;give the Original
         Author credit reasonable to the medium or means You are
         utilising&rdquo;. Individual OSM mappers do not request a
         Our CC BY-SA licence requires you to &ldquo;give the Original
         Author credit reasonable to the medium or means You are
         utilising&rdquo;. Individual OSM mappers do not request a


@@ -1093,57 +1077,53 @@ en:
         agency or other major source has been included in
         OpenStreetMap, it may be reasonable to credit them by directly
         reproducing their credit or by linking to it on this page.
         agency or other major source has been included in
         OpenStreetMap, it may be reasonable to credit them by directly
         reproducing their credit or by linking to it on this page.

-      </p>
-
-      <!--
-      Information for page editors
-
-      The following lists only those organisations who require attribution
-      as a condition of their data being used in OpenStreetMap. It is not a
-      general catalogue of imports, and must not be used except when
-      attribution is required to comply with the licence of the imported
-      data.
-
-      Any additions here must be discussed with OSM sysadmins first.
-      -->
-
-      <ul id="contributors">
-          <li><strong>Australia</strong>: Contains suburb data based
-          on Australian Bureau of Statistics data.</li>
-          <li><strong>Austria</strong>: Contains data from
-          <a href="http://data.wien.gv.at/">Stadt Wien</a> (under
-          <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-          <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
-          Land Tirol (under <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT with amendments</a>).</li>
-          <li><strong>Canada</strong>: Contains data from
-          GeoBase&reg;, GeoGratis (&copy; Department of Natural
-          Resources Canada), CanVec (&copy; Department of Natural
-          Resources Canada), and StatCan (Geography Division,
-          Statistics Canada).</li>
-          <li><strong>France</strong>: Contains data sourced from
-          Direction Générale des Impôts.</li>
-          <li><strong>Netherlands</strong>: Contains &copy; AND data, 2007
-          (<a href="http://www.and.com">www.and.com</a>)</li>
-          <li><strong>New Zealand</strong>: Contains data sourced from
-          Land Information New Zealand. Crown Copyright reserved.</li>
-          <li><strong>Poland</strong>: Contains data from <a
-          href="http://ump.waw.pl/">UMP-pcPL maps</a>. Copyright
-          UMP-pcPL contributors.
-          <a href="http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing">
-          More about OSM&apos;s use of UMP data</a></li>
-          <li><strong>South Africa</strong>: Contains data sourced from
-          <a href="http://www.ngi.gov.za/">Chief Directorate:
-          National Geo-Spatial Information</a>, State copyright reserved.</li>
-          <li><strong>United Kingdom</strong>: Contains Ordnance
-          Survey data &copy; Crown copyright and database right
-          2010.</li>
-      </ul>
-
-      <p>
+      contributors_au_html: |
+        <strong>Australia</strong>: Contains suburb data based
+        on Australian Bureau of Statistics data.
+      contributors_at_html: |
+        <strong>Austria</strong>: Contains data from
+        <a href="http://data.wien.gv.at/">Stadt Wien</a> (under
+        <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
+        <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> and
+        Land Tirol (under <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT with amendments</a>).
+      contributors_ca_html: |
+        <strong>Canada</strong>: Contains data from
+        GeoBase&reg;, GeoGratis (&copy; Department of Natural
+        Resources Canada), CanVec (&copy; Department of Natural
+        Resources Canada), and StatCan (Geography Division,
+        Statistics Canada).
+      contributors_fr_html: |
+        <strong>France</strong>: Contains data sourced from
+        Direction Générale des Impôts.
+      contributors_nl_html: |
+        <strong>Netherlands</strong>: Contains &copy; AND data, 2007
+        (<a href="http://www.and.com">www.and.com</a>)
+      contributors_nz_html: |
+        <strong>New Zealand</strong>: Contains data sourced from
+        Land Information New Zealand. Crown Copyright reserved.
+      contributors_pl_html: |
+        <strong>Poland</strong>: Contains data from <a
+        href="http://ump.waw.pl/">UMP-pcPL maps</a>. Copyright
+        UMP-pcPL contributors.
+        <a href="http://wiki.openstreetmap.org/wiki/UMP2OSM_Importing">
+        More about OSM&apos;s use of UMP data</a>
+      contributors_za_html: |
+        <strong>South Africa</strong>: Contains data sourced from
+        <a href="http://www.ngi.gov.za/">Chief Directorate:
+        National Geo-Spatial Information</a>, State copyright reserved.
+      contributors_gb_html: |
+        <strong>United Kingdom</strong>: Contains Ordnance
+        Survey data &copy; Crown copyright and database right
+        2010.
+      contributors_footer_1_html: |
+        For further details of these, and other sources that have been used
+        to help improve OpenStreetMap, please see the <a
+        href="http://wiki.openstreetmap.org/wiki/Contributors">Contributors
+        page</a> on the OpenStreetMap Wiki.
+      contributors_footer_2_html: |

         Inclusion of data in OpenStreetMap does not imply that the original
         data provider endorses OpenStreetMap, provides any warranty, or
         accepts any liability.
         Inclusion of data in OpenStreetMap does not imply that the original
         data provider endorses OpenStreetMap, provides any warranty, or
         accepts any liability.

-      </p>

   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] %{user} commented on your diary entry"
   notifier:
     diary_comment_notification:
       subject: "[OpenStreetMap] %{user} commented on your diary entry"


@@ -1489,8 +1469,8 @@ en:
       visibility: "Visibility:"
     trace_paging_nav:
       showing_page: "Showing page %{page}"
       visibility: "Visibility:"
     trace_paging_nav:
       showing_page: "Showing page %{page}"

-      next: "Next »"
-      previous: "« Previous"
+      older: "Older Traces"
+      newer: "Newer Traces"

     trace:
       pending: "PENDING"
       count_points: "%{count} points"
     trace:
       pending: "PENDING"
       count_points: "%{count} points"


@@ -1512,6 +1492,7 @@ en:
       your_traces: "Your GPS traces"
       public_traces_from: "Public GPS traces from %{user}"
       tagged_with: " tagged with %{tags}"
       your_traces: "Your GPS traces"
       public_traces_from: "Public GPS traces from %{user}"
       tagged_with: " tagged with %{tags}"

+      empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."

     delete:
       scheduled_for_deletion: "Trace scheduled for deletion"
     make_public:
     delete:
       scheduled_for_deletion: "Trace scheduled for deletion"
     make_public:


@@ -1761,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"


@@ -1850,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:


@@ -1962,6 +1947,9 @@ en:
       status: "Status"
       revoker_name: "Revoked by"
       not_revoked: "(not revoked)"
       status: "Status"
       revoker_name: "Revoked by"
       not_revoked: "(not revoked)"

+      showing_page: "Showing page %{page}"
+      next: "Next »"
+      previous: "« Previous"

     helper:
       time_future: "Ends in %{time}."
       until_login: "Active until the user logs in."
     helper:
       time_future: "Ends in %{time}."
       until_login: "Active until the user logs in."