Revert en-GB.yml to master.

Only en.yml should be changed in pull requests, en-GB.yml is taken
care of through Translatewiki

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index e6ebbb6a87b4ceef301ca49e869701909ddfb69c..07f8eaeec4fe7131d90060989806c14fcd1b1b0d 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -150,7 +150,6 @@ en-GB:
         title_comment: Changeset %{id} - %{comment}
       join_discussion: Log in to join the discussion
       discussion: Discussion
-      report: Report this changeset?
     node:
       title: 'Node: %{name}'
       history_title: 'Node History: %{name}'
@@ -232,7 +231,6 @@ en-GB:
       reopened_by_anonymous: Reactivated by anonymous <abbr title='%{exact_time}'>%{when}
         ago</abbr>
       hidden_by: Hidden by %{user} <abbr title='%{exact_time}'>%{when} ago</abbr>
-      report: Report this note?
     query:
       title: Query Features
       introduction: Click on the map to find nearby features.
@@ -324,12 +322,10 @@ en-GB:
       edit_link: Edit this entry
       hide_link: Hide this entry
       confirm: Confirm
-      report: Report this entry?
     diary_comment:
       comment_from: Comment from %{link_user} on %{comment_created_at}
       hide_link: Hide this comment
       confirm: Confirm
-      report: Report this comment?
     location:
       location: 'Location:'
       view: View
@@ -943,118 +939,6 @@ en-GB:
     results:
       no_results: No results found
       more_results: More results
-  issues:
-    report: Report
-    resolve: Resolve
-    ignore: Ignore
-    reopen: Reopen
-    index:
-      search:
-        user_not_found: User does not exist
-        issues_not_found: No such issues found
-    create:
-      successful_report: Your report has been registered sucessfully
-      provide_details: Please provide the required details
-    update:
-      new_report: Your report been registered sucessfully
-      successful_update: Your report has been updated successfully
-      provide_details: Please provide the required details
-    new:
-      details: Please provide some more details into the problem. (This field cannot be left blank!)
-      select: Select a reason for your report
-      disclaimer:
-        placeholder: Before sending in a report for official action, be sure that
-        placeholder1: You are sure that the problem is not just a mistake
-        placeholder2: You are unable to fix the problem yourself
-        placeholder3: 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
-      comment_created: Your comment was successfully created
-    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:
-      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
-      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
-      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
-      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
-      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
   layouts:
     project_name:
       title: OpenStreetMap
@@ -1071,7 +955,6 @@ en-GB:
     edit: Edit
     history: History
     export: Export
-    reports: Reports
     data: Data
     export_data: Export Data
     gps_traces: GPS Traces
@@ -1477,11 +1360,6 @@ en-GB:
       details: More details about the changeset can be found at %{url}.
       unsubscribe: To unsubscribe from updates to this changeset, visit %{url} and
         click "Unsubscribe".
-    new_issue_notification:
-      subject: "[OpenStreetMap] New Issue"
-      greeting: "Hi,"
-      new_issue: "A new issue has been created"
-      url: You can view the issue here
   message:
     inbox:
       title: Inbox
@@ -1811,8 +1689,6 @@ en-GB:
     require_cookies:
       cookies_needed: You appear to have cookies disabled - please enable cookies
         in your browser before continuing.
-    require_admin:
-      not_an_admin: You need to be an admin to perform that action.
     require_moderator:
       not_a_moderator: You need to be a moderator to perform that action.
     setup_user_auth:
@@ -2116,7 +1992,6 @@ en-GB:
       friends_diaries: friends' diary entries
       nearby_changesets: nearby user changesets
       nearby_diaries: nearby user diary entries
-      report: Report this user?
     popup:
       your location: Your location
       nearby mapper: Nearby mapper