From: Tom Hughes Date: Sun, 15 Jun 2014 13:54:39 +0000 (+0100) Subject: Merge branch 'master' into overpass X-Git-Tag: live~4341^2~8 X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/a70b61315c2331c18123a0b36782d6ef6bb3ab3e Merge branch 'master' into overpass --- a70b61315c2331c18123a0b36782d6ef6bb3ab3e diff --cc config/locales/en.yml index 3e452571b,fe5f58d51..eb2991d4e --- a/config/locales/en.yml +++ b/config/locales/en.yml @@@ -2108,11 -2102,9 +2109,11 @@@ en createnote_disabled_tooltip: Zoom in to add a note to the map map_notes_zoom_in_tooltip: Zoom in to see map notes map_data_zoom_in_tooltip: Zoom in to see map data + queryfeature_tooltip: Query features + queryfeature_disabled_tooltip: Zoom in to query features notes: new: - intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem. (Please don't enter personal information here.)" + intro: "Spotted a mistake or something missing? Let other mappers know so we can fix it. Move the marker to the correct position and type a note to explain the problem. (Please don't enter personal information or information from copyrighted maps or directory listings.)" add: Add Note show: anonymous_warning: This note includes comments from anonymous users which should be independently verified.