Add summary + informal translations links to terms page

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e2ca59fb659ab79a2f50ebb203e8610df6b296c4..5e82b80c878deee767d9466ecd0d71373da66c88 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -141,6 +141,8 @@ en:
     common_details:
       edited_at: "Edited at:"
       edited_by: "Edited by:"
     common_details:
       edited_at: "Edited at:"
       edited_by: "Edited by:"

+      deleted_at: "Deleted at:"
+      deleted_by: "Deleted by:"

       version: "Version:"
       in_changeset: "In changeset:"
       changeset_comment: "Comment:"
       version: "Version:"
       in_changeset: "In changeset:"
       changeset_comment: "Comment:"


@@ -1059,6 +1061,8 @@ en:
           Resources Canada), CanVec (© Department of Natural
           Resources Canada), and StatCan (Geography Division,
           Statistics Canada).</li>
           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>New Zealand</strong>: Contains data sourced from
           Land Information New Zealand. Crown Copyright reserved.</li>
           <li><strong>Poland</strong>: Contains data from <a
           <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


@@ -1376,10 +1380,9 @@ en:
       help: "Help"
       help_url: "http://wiki.openstreetmap.org/wiki/Upload"
     trace_header:
       help: "Help"
       help_url: "http://wiki.openstreetmap.org/wiki/Upload"
     trace_header:

-      your_traces: "See just your traces"

       upload_trace: "Upload a trace"
       see_all_traces: "See all traces"
       upload_trace: "Upload a trace"
       see_all_traces: "See all traces"

-      see_your_traces: "See all your traces"
+      see_your_traces: "See your traces"

       traces_waiting: "You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
     trace_optionals:
       tags: "Tags"
       traces_waiting: "You have {{count}} traces waiting for upload. Please consider waiting for these to finish before uploading any more, so as not to block the queue for other users."
     trace_optionals:
       tags: "Tags"


@@ -1576,6 +1579,10 @@ en:
       consider_pd: "In addition to the above agreement, I consider my contributions to be in the Public Domain"
       consider_pd_why: "what's this?"
       consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
       consider_pd: "In addition to the above agreement, I consider my contributions to be in the Public Domain"
       consider_pd_why: "what's this?"
       consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain

+      summary: "Human readable summary in English."
+      summary_url: http://www.osmfoundation.org/wiki/License/Contributor_Terms_Summary
+      translations: "Informal translations / Informelle Übersetzung"
+      translations_url: http://www.osmfoundation.org/wiki/License/Contributor_Terms/Informal_Translations

       agree: Agree
       declined: "http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
       decline: "Decline"
       agree: Agree
       declined: "http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined"
       decline: "Decline"