Fix merge issues

This commit is contained in:
Bryan Housel
2018-12-19 17:12:06 -05:00
parent c501c44f60
commit 2deadd5d6c
12 changed files with 110 additions and 192 deletions
+3 -3
View File
@@ -480,15 +480,15 @@ en:
notes:
tooltip: Note data from OpenStreetMap
title: OpenStreetMap notes
keepRight:
tooltip: Quality Assurance data from keepright.at
title: KeepRight Issues
custom:
tooltip: "Drag and drop a data file onto the page, or click the button to setup"
title: Custom Map Data
zoom: Zoom to data
fill_area: Fill Areas
map_features: Map Features
QA:
title: Quality Assurance
keepRight: KeepRight
autohidden: "These features have been automatically hidden because too many would be shown on the screen. You can zoom in to edit them."
osmhidden: "These features have been automatically hidden because the OpenStreetMap layer is hidden."
feature: