Store the report category.

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 558e960b4e12f9b923e30d78c2c59f72c75ba5dc..7c127ffc7b273b9fa287c42acf7ca93748af2f66 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -371,7 +371,6 @@ en:
     search:
       title:
         latlon: 'Results from <a href="http://openstreetmap.org/">Internal</a>'
     search:
       title:
         latlon: 'Results from <a href="http://openstreetmap.org/">Internal</a>'

-        us_postcode: 'Results from <a href="http://geocoder.us/">Geocoder.us</a>'

         uk_postcode: 'Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
         ca_postcode: 'Results from <a href="http://geocoder.ca/">Geocoder.CA</a>'
         osm_nominatim: 'Results from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'
         uk_postcode: 'Results from <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>'
         ca_postcode: 'Results from <a href="http://geocoder.ca/">Geocoder.CA</a>'
         osm_nominatim: 'Results from <a href="http://nominatim.openstreetmap.org/">OpenStreetMap Nominatim</a>'


@@ -934,7 +933,6 @@ en:
         resolve_with_user: You have tried to resolve the problem with the user
     show:
       comments:
         resolve_with_user: You have tried to resolve the problem with the user
     show:
       comments:

-        reassign: The Issue was reassigned

         reassign_param: Reassign Issue?
     comment:
       provide_details: Please provide the required details
         reassign_param: Reassign Issue?
     comment:
       provide_details: Please provide the required details


@@ -942,84 +940,37 @@ en:
     resolved: Issue status has been set to 'Resolved'
     ignored: Issue status has been set to 'Ignored'
     reopened: Issue status has been set to 'Open'
     resolved: Issue status has been set to 'Resolved'
     ignored: Issue status has been set to 'Ignored'
     reopened: Issue status has been set to 'Open'

-    report_strings:
+  reports:
+    categories:

       DiaryEntry:
       DiaryEntry:

-        spam:
-          type: "[SPAM]"
-          details: This Diary Entry is/contains spam
-        offensive:
-          type: "[OFFENSIVE]"
-          details: This Diary Entry is obscene/offensive
-        threat:
-          type: "[THREAT]"
-          details: This Diary Entry contains a threat
-        other:
-          type: "[OTHER]"
-          details: Other
+        spam: This Diary Entry is/contains spam
+        offensive: This Diary Entry is obscene/offensive
+        threat: This Diary Entry contains a threat
+        other: Other

       DiaryComment:
       DiaryComment:

-        spam:
-          type: "[SPAM]"
-          details: This Diary Comment is/contains spam
-        offensive:
-          type: "[OFFENSIVE]"
-          details: This Diary Comment is obscene/offensive
-        threat:
-          type: "[THREAT]"
-          details: This Diary Comment contains a threat
-        other:
-          type: "[OTHER]"
-          details: Other
+        spam: This Diary Comment is/contains spam
+        offensive: This Diary Comment is obscene/offensive
+        threat: This Diary Comment contains a threat
+        other: Other

       User:
       User:

-        spam:
-          type: "[SPAM]"
-          details: This User profile is/contains spam
-        offensive:
-          type: "[OFFENSIVE]"
-          details: This User profile is obscene/offensive
-        threat:
-          type: "[THREAT]"
-          details: This User profile contains a threat
-        vandal:
-          type: "[VANDAL]"
-          details: This User is a vandal
-        other:
-          type: "[OTHER]"
-          details: Other
+        spam: This User profile is/contains spam
+        offensive: This User profile is obscene/offensive
+        threat: This User profile contains a threat
+        vandal: This User is a vandal
+        other: Other

       Changeset:
       Changeset:

-        undiscussed_import:
-          type: "[UNDISCUSSED-IMPORT]"
-          details: This changeset is an undiscussed import
-        mechanical_edit:
-          type: "[MECH-EDIT]"
-          details: This changeset is a mechanical edit
-        edit_error:
-          type: "[EDIT-ERROR]"
-          details: This changeset contains a newbie or an editor error
-        spam:
-          type: "[SPAM]"
-          details: This changeset is/contains spam
-        vandalism:
-          type: "[VANDALISM]"
-          details: This changeset is/contains vandalism
-        other:
-          type: "[OTHER]"
-          details: Other
+        undiscussed_import: This changeset is an undiscussed import
+        mechanical_edit: This changeset is a mechanical edit
+        edit_error: This changeset contains a newbie or an editor error
+        spam: This changeset is/contains spam
+        vandalism: This changeset is/contains vandalism
+        other: Other

       Note:
       Note:

-        spam:
-          type: "[SPAM]"
-          details: This note is spam
-        vandalism:
-          type: "[VANDALISM]"
-          details: This note is vandalism
-        personal:
-          type: "[PERSONAL]"
-          details: This note contains personal data
-        abusive:
-          type: "[ABUSIVE]"
-          details: This note is abusive
-        other:
-          type: "[OTHER]"
-          details: Other
+        spam: This note is spam
+        vandalism: This note is vandalism
+        personal: This note contains personal data
+        abusive: This note is abusive
+        other: Other

   layouts:
     project_name:
       # in <title>
   layouts:
     project_name:
       # in <title>


@@ -1038,7 +989,7 @@ en:
     edit: Edit
     history: History
     export: Export
     edit: Edit
     history: History
     export: Export

-    reports: Reports
+    issues: Issues

     data: Data
     export_data: Export Data
     gps_traces: GPS Traces
     data: Data
     export_data: Export Data
     gps_traces: GPS Traces


@@ -1050,7 +1001,7 @@ en:
     intro_header: Welcome to OpenStreetMap!
     intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
     intro_2_create_account: "Create a user account"
     intro_header: Welcome to OpenStreetMap!
     intro_text: OpenStreetMap is a map of the world, created by people like you and free to use under an open license.
     intro_2_create_account: "Create a user account"

-    partners_html: "Hosting is supported by %{ucl}, %{bytemark} and %{ic}, and other %{partners}."
+    partners_html: "Hosting is supported by %{ucl}, %{bytemark}, %{ic}, and other %{partners}."

     partners_ucl: "UCL"
     partners_ic: "Imperial College London"
     partners_bytemark: "Bytemark Hosting"
     partners_ucl: "UCL"
     partners_ic: "Imperial College London"
     partners_bytemark: "Bytemark Hosting"


@@ -1123,9 +1074,7 @@ en:
       more_title_html: Finding out more
       more_1_html: |
         Read more about using our data, and how to credit us, at the <a
       more_title_html: Finding out more
       more_1_html: |
         Read more about using our data, and how to credit us, at the <a

-        href="http://osmfoundation.org/Licence">OSMF Licence page</a> and the community <a
-        href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
-        FAQ</a>.
+        href="http://osmfoundation.org/Licence">OSMF Licence page</a>.

       more_2_html: |
         Although OpenStreetMap is open data, we cannot provide a
         free-of-charge map API for third-parties.
       more_2_html: |
         Although OpenStreetMap is open data, we cannot provide a
         free-of-charge map API for third-parties.


@@ -1327,7 +1276,9 @@ en:
       Our contributors include enthusiast mappers, GIS professionals, engineers
       running the OSM servers, humanitarians mapping disaster-affected areas,
       and many more.
       Our contributors include enthusiast mappers, GIS professionals, engineers
       running the OSM servers, humanitarians mapping disaster-affected areas,
       and many more.

-      To learn more about the community, see the <a href='%{diary_path}'>user diaries</a>,
+      To learn more about the community, see the
+      <a href='https://blog.openstreetmap.org'>OpenStreetMap Blog</a>,
+      <a href='%{diary_path}'>user diaries</a>,

       <a href='http://blogs.openstreetmap.org/'>community blogs</a>, and
       the <a href='http://www.osmfoundation.org/'>OSM Foundation</a> website.
     open_data_title: Open Data
       <a href='http://blogs.openstreetmap.org/'>community blogs</a>, and
       the <a href='http://www.osmfoundation.org/'>OSM Foundation</a> website.
     open_data_title: Open Data


@@ -1544,7 +1495,7 @@ en:
       get_directions_title: "Find directions between two points"
       from: "From"
       to: "To"
       get_directions_title: "Find directions between two points"
       from: "From"
       to: "To"

-      where_am_i: "Where am I?"
+      where_am_i: "Where is this?"

       where_am_i_title: Describe the current location using the search engine
       submit_text: "Go"
     key:
       where_am_i_title: Describe the current location using the search engine
       submit_text: "Go"
     key: