Merge branch 'master' of git://git.openstreetmap.org/rails into openstreetbugs2

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 667a6faeb76e6a1a659c92eaac170e14ec036b20..6b6c3703684e704b1e26a4f52b044400d299d6f6 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1183,7 +1183,6 @@ en:
       your_bug: "{{commenter}} has left a comment on one of your map bug reports near {{place}}."
       commented_bug: "{{commenter}} has left a comment on a map bug report you have commented on. The bug is near {{place}}."
       details: "More details about the bug report can be found at {{URL}}."
       your_bug: "{{commenter}} has left a comment on one of your map bug reports near {{place}}."
       commented_bug: "{{commenter}} has left a comment on a map bug report you have commented on. The bug is near {{place}}."
       details: "More details about the bug report can be found at {{URL}}."

-

   message:
     inbox:
       title: "Inbox"
   message:
     inbox:
       title: "Inbox"


@@ -1914,10 +1913,11 @@ en:
       Mark as fixed: Mark as fixed
       Cancel: Cancel
       Create OpenStreetBug: Create OpenStreetBug
       Mark as fixed: Mark as fixed
       Cancel: Cancel
       Create OpenStreetBug: Create OpenStreetBug

-      Create bug: Create bug
-      Bug description: Bug description
-      Create: Create
+      Create bug: Report a problem with the map
+      Bug description: Problem description
+      Create: Report problem

       Permalink: Permalink
       Login: Login
       Details: Details
       Permalink: Permalink
       Login: Login
       Details: Details

+      edityourself: You can also edit the map directly your self