cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'upstream/pull/1769'

Browse source
This commit is contained in:
Tom Hughes 2018-02-27 20:22:15 +00:00
commit c819c8114d
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
config/locales/en.yml
View file

@ -1660,7 +1660,7 @@ en:
public_traces: "Public GPS traces" public_traces: "Public GPS traces"
your_traces: "Your GPS traces" your_traces: "Your GPS traces"
public_traces_from: "Public GPS traces from %{user}" public_traces_from: "Public GPS traces from %{user}"
description: "Browse recent GPS track uploads" description: "Browse recent GPS trace uploads"
tagged_with: " tagged with %{tags}" tagged_with: " tagged with %{tags}"
empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>." empty_html: "Nothing here yet. <a href='%{upload_link}'>Upload a new trace</a> or learn more about GPS tracing on the <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>wiki page</a>."
delete: delete:

8
config/potlatch/locales/en.yml
View file

File diff suppressed because one or more lines are too long