Refactor reports form to use bootstrap

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8c4dd25d83f4d325fda5fa50d00f0e0d7febb96b..fe07bab929acf35aaf3625ea2030ae71bf06e16d 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -104,6 +104,9 @@ en:
         title: "Subject"
         body: "Body"
         recipient: "Recipient"
         title: "Subject"
         body: "Body"
         recipient: "Recipient"

+      report:
+        category: Select a reason for your report
+        details: Please provide some more details about the problem (required).

       user:
         email: "Email"
         active: "Active"
       user:
         email: "Email"
         active: "Active"


@@ -403,7 +406,7 @@ en:
     diary_entry:
       posted_by_html: "Posted by %{link_user} on %{created} in %{language_link}"
       comment_link: Comment on this entry
     diary_entry:
       posted_by_html: "Posted by %{link_user} on %{created} in %{language_link}"
       comment_link: Comment on this entry

-      reply_link: Reply to this entry
+      reply_link: Send a message to the author

       comment_count:
         zero: No comments
         one: "%{count} comment"
       comment_count:
         zero: No comments
         one: "%{count} comment"


@@ -1118,8 +1121,6 @@ en:
     new:
       title_html: "Report %{link}"
       missing_params: "Cannot create a new report"
     new:
       title_html: "Report %{link}"
       missing_params: "Cannot create a new report"

-      details: Please provide some more details about the problem (required).
-      select: "Select a reason for your report:"

       disclaimer:
         intro: "Before sending your report to the site moderators, please ensure that:"
         not_just_mistake: You are certain that the problem is not just a mistake
       disclaimer:
         intro: "Before sending your report to the site moderators, please ensure that:"
         not_just_mistake: You are certain that the problem is not just a mistake


@@ -1206,12 +1207,12 @@ en:
       subject: "[OpenStreetMap] %{user} commented on a diary entry"
       hi: "Hi %{to_user},"
       header: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"
       subject: "[OpenStreetMap] %{user} commented on a diary entry"
       hi: "Hi %{to_user},"
       header: "%{from_user} has commented on the OpenStreetMap diary entry with the subject %{subject}:"

-      footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or reply at %{replyurl}"
+      footer: "You can also read the comment at %{readurl} and you can comment at %{commenturl} or send a message to the author at %{replyurl}"

     message_notification:
       subject_header: "[OpenStreetMap] %{subject}"
       hi: "Hi %{to_user},"
       header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"
     message_notification:
       subject_header: "[OpenStreetMap] %{subject}"
       hi: "Hi %{to_user},"
       header: "%{from_user} has sent you a message through OpenStreetMap with the subject %{subject}:"

-      footer_html: "You can also read the message at %{readurl} and you can reply at %{replyurl}"
+      footer_html: "You can also read the message at %{readurl} and you can send a message to the author at %{replyurl}"

     friendship_notification:
       hi: "Hi %{to_user},"
       subject: "[OpenStreetMap] %{user} added you as a friend"
     friendship_notification:
       hi: "Hi %{to_user},"
       subject: "[OpenStreetMap] %{user} added you as a friend"


@@ -1364,7 +1365,7 @@ en:
     about:
       next: Next
       copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors
     about:
       next: Next
       copyright_html: <span>&copy;</span>OpenStreetMap<br>contributors

-      used_by_html: "%{name} powers map data on thousands of web sites, mobile apps, and hardware devices"
+      used_by_html: "%{name} provides map data for thousands of web sites, mobile apps, and hardware devices"

       lede_text: |
         OpenStreetMap is built by a community of mappers that contribute and maintain data
         about roads, trails, cafés, railway stations, and much more, all over the world.
       lede_text: |
         OpenStreetMap is built by a community of mappers that contribute and maintain data
         about roads, trails, cafés, railway stations, and much more, all over the world.


@@ -1428,26 +1429,30 @@ en:
           may distribute the result only under the same licence. The
           full <a href="https://opendatacommons.org/licenses/odbl/1.0/">legal
           code</a> explains your rights and responsibilities.
           may distribute the result only under the same licence. The
           full <a href="https://opendatacommons.org/licenses/odbl/1.0/">legal
           code</a> explains your rights and responsibilities.

-        intro_3_html: |
-          The cartography in our map tiles, and our documentation, are
-          licensed under the <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
-          Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA).
+        intro_3_1_html: |
+          Our documentation is licensed under the 
+          <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
+          Commons Attribution-ShareAlike 2.0</a> license (CC BY-SA 2.0).

         credit_title_html: How to credit OpenStreetMap
         credit_1_html: |
           We require that you use the credit &ldquo;&copy; OpenStreetMap
           contributors&rdquo;.
         credit_title_html: How to credit OpenStreetMap
         credit_1_html: |
           We require that you use the credit &ldquo;&copy; OpenStreetMap
           contributors&rdquo;.

-        credit_2_html: |
+        credit_2_1_html: |

           You must also make it clear that the data is available under the Open
           You must also make it clear that the data is available under the Open

-          Database License, and if using our map tiles, that the cartography is
-          licensed as CC BY-SA. You may do this by linking to
+          Database License. You may do this by linking to

           <a href="https://www.openstreetmap.org/copyright">this copyright page</a>.
           Alternatively, and as a requirement if you are distributing OSM in a
           data form, you can name and link directly to the license(s). In media
           where links are not possible (e.g. printed works), we suggest you
           direct your readers to openstreetmap.org (perhaps by expanding
           <a href="https://www.openstreetmap.org/copyright">this copyright page</a>.
           Alternatively, and as a requirement if you are distributing OSM in a
           data form, you can name and link directly to the license(s). In media
           where links are not possible (e.g. printed works), we suggest you
           direct your readers to openstreetmap.org (perhaps by expanding

-          'OpenStreetMap' to this full address), to opendatacommons.org, and
-          if relevant, to creativecommons.org.
-        credit_3_html: |
+          'OpenStreetMap' to this full address) and to opendatacommons.org.
+        credit_3_1_html: |
+          The map tiles in the &ldquo;standard style&rdquo; at www.openstreetmap.org are a 
+          Produced Work by the OpenStreetMap Foundation using OpenStreetMap data 
+          under the Open Database License. If you are using these tiles please use 
+          the following attribution: 
+          &ldquo;Base map and data from OpenStreetMap and OpenStreetMap Foundation&rdquo;. 
+        credit_4_html: |

           For a browsable electronic map, the credit should appear in the corner of the map.
           For example:
         attribution_example:
           For a browsable electronic map, the credit should appear in the corner of the map.
           For example:
         attribution_example:


@@ -2437,7 +2442,7 @@ en:
       next: "Next »"
       previous: "« Previous"
   notes:
       next: "Next »"
       previous: "« Previous"
   notes:

-    mine:
+    index:

       title: "Notes submitted or commented on by %{user}"
       heading: "%{user}'s notes"
       subheading_html: "Notes submitted or commented on by %{user}"
       title: "Notes submitted or commented on by %{user}"
       heading: "%{user}'s notes"
       subheading_html: "Notes submitted or commented on by %{user}"


@@ -2491,6 +2496,7 @@ en:
         cycle_map: Cycle Map
         transport_map: Transport Map
         hot: Humanitarian
         cycle_map: Cycle Map
         transport_map: Transport Map
         hot: Humanitarian

+        opnvkarte: ÖPNVKarte

       layers:
         header: Map Layers
         notes: Map Notes
       layers:
         header: Map Layers
         notes: Map Notes


@@ -2502,6 +2508,7 @@ en:
       donate_link_text: "<a class='donate-attr' href='%{donate_url}'>Make a Donation</a>"
       terms: "<a href='%{terms_url}' target='_blank'>Website and API terms</a>"
       thunderforest: "Tiles courtesy of <a href='%{thunderforest_url}' target='_blank'>Andy Allan</a>"
       donate_link_text: "<a class='donate-attr' href='%{donate_url}'>Make a Donation</a>"
       terms: "<a href='%{terms_url}' target='_blank'>Website and API terms</a>"
       thunderforest: "Tiles courtesy of <a href='%{thunderforest_url}' target='_blank'>Andy Allan</a>"

+      opnvkarte: "Tiles courtesy of <a href='%{memomaps_url}' target='_blank'>MeMoMaps</a>"

       hotosm: "Tiles style by <a href='%{hotosm_url}' target='_blank'>Humanitarian OpenStreetMap Team</a> hosted by <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap France</a>"
     site:
       edit_tooltip: Edit the map
       hotosm: "Tiles style by <a href='%{hotosm_url}' target='_blank'>Humanitarian OpenStreetMap Team</a> hosted by <a href='%{osmfrance_url}' target='_blank'>OpenStreetMap France</a>"
     site:
       edit_tooltip: Edit the map