From: Tom Hughes Date: Sun, 29 Dec 2019 19:16:33 +0000 (+0000) Subject: Merge remote-tracking branch 'upstream/pull/2475' X-Git-Tag: live~3159 X-Git-Url: https://git.openstreetmap.org./rails.git/commitdiff_plain/e0f3fdbac7200c20b2323ef9a927710fb00ad9aa?hp=7a81258ddc7ece9e9f641083acfbc555bdedc009 Merge remote-tracking branch 'upstream/pull/2475' --- diff --git a/app/views/layouts/_flash.html.erb b/app/views/layouts/_flash.html.erb index 8b04dac91..0f39c4a47 100644 --- a/app/views/layouts/_flash.html.erb +++ b/app/views/layouts/_flash.html.erb @@ -1,7 +1,7 @@ <% if flash[:error] %>
- " type="image/svg+xml"> + " type="image/svg+xml" /> <%= image_tag("notice.png", :srcset => image_path("notice.svg"), :class => "small_icon", :border => 0) %>
<%= flash[:error] %>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index c95cc4a75..6df8f02da 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -2,7 +2,7 @@

- " type="image/svg+xml"> + " type="image/svg+xml" /> <%= image_tag "osm_logo.png", :srcset => image_path("osm_logo.svg"), :alt => t("layouts.logo.alt_text"), :class => "logo" %> <%= t "layouts.project_name.h1" %> diff --git a/app/views/layouts/error.html.erb b/app/views/layouts/error.html.erb index 9b5f4f34b..2b769958e 100644 --- a/app/views/layouts/error.html.erb +++ b/app/views/layouts/error.html.erb @@ -8,7 +8,7 @@ - " type="image/svg+xml"> + " type="image/svg+xml" /> <%= image_tag "osm_logo.png", :srcset => image_path("osm_logo.svg"), :alt => t("layouts.logo.alt_text"), :class => "logo" %> diff --git a/config/locales/fit.yml b/config/locales/fit.yml index e50595f63..7f99b5159 100644 --- a/config/locales/fit.yml +++ b/config/locales/fit.yml @@ -806,8 +806,13 @@ fit: area_to_export: Eksporteerattava alue format_to_export: Eksporteerausmuoto osm_xml_data: OpenStreetMap XML-taatta + embeddable_html: HTML-kooti licence: Lisensi too_large: + planet: + title: Planet OSM + overpass: + title: Overpass API other: title: Muut läheet description: Muut läheet ovat esillä OpenStreetMap-wikissä @@ -847,6 +852,9 @@ fit: close: Sulje search: search: Haku + from: Lähtöpaikka + to: Määränpää + where_am_i: Mikä tämä paikka on? submit_text: Hae key: table: @@ -886,6 +894,8 @@ fit: owner: 'Käyttäjä:' description: 'Kuvvaus:' edit_trace: Mookkaa jäljen tietoja + trace_paging_nav: + showing_page: Sivu %{page} trace: edit: mookkaa edit_map: Mookkaa karttaa @@ -906,6 +916,7 @@ fit: edit: Mookkaa yksityiskohtia confirm: Oletko varma? form: + name: Nimi allow_read_prefs: käyttäjäinställninkien näkeminen. allow_write_prefs: käyttäjäinställninkien muuttaminen. users: @@ -950,6 +961,8 @@ fit: confirm password: 'Salasana uuesti:' continue: Luo konttu terms: + title: Ehot + heading: Ehot continue: Jatka legale_names: france: Franska @@ -972,6 +985,7 @@ fit: email address: 'E-postiatressi:' settings_link_text: inställninkit my friends: Minun ystävät + km away: '%{count} kilometrin päässä' popup: your location: Sinun paikka friend: Kaveri diff --git a/config/locales/sr.yml b/config/locales/sr.yml index d8ccb7f10..33d9b9bf9 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -144,11 +144,11 @@ sr: opened_at_html: Направљено %{when} opened_at_by_html: Креирано %{when} од стране %{user} commented_at_html: Освежено пре %{when} - commented_at_by_html: '%{user} освежио пре %{when}' - closed_at_html: Решено пре %{when} - closed_at_by_html: '%{user} разрешио пре %{when}' - reopened_at_html: Поново покренуто пре %{when} - reopened_at_by_html: '%{user} поново покренуо пре %{when}' + commented_at_by_html: '%{user} је ажурирао/-ла у %{when}' + closed_at_html: Решено у %{when} + closed_at_by_html: '%{user} је решио/-ла у %{when}' + reopened_at_html: Поново покренуто у %{when} + reopened_at_by_html: '%{user} је поново покренуо/-ла у %{when}' rss: title: ОпенСтритМап белешке description_area: Списак белешки, пријављених, коментарисаних или затворених @@ -164,11 +164,11 @@ sr: browse: created: Направљено closed: Затворено - created_html: Направљено пре %{time} - closed_html: Затворено пре %{time} - created_by_html: Направио %{user} пре %{time} - deleted_by_html: Избрисао %{user} пре %{time} - edited_by_html: Уредио корисник %{user} пре %{time} + created_html: Направљено у %{time} + closed_html: Затворено у %{time} + created_by_html: '%{user} је направио/-ла у %{time}' + deleted_by_html: '%{user} је избрисао/-ла у %{time}' + edited_by_html: '%{user} је уредио/-ла у %{time}' closed_by_html: Затворио корисник %{user} пре %{time} version: Верзија in_changeset: Скуп промена diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 1c7f6061d..e56aa3eaf 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -68,7 +68,7 @@ tr: create: Gönder update: Değişiklikleri Kaydet user_block: - create: Engelle + create: Engel oluştur update: Engeli güncelle activerecord: errors: diff --git a/vendor/assets/iD/iD.css.erb b/vendor/assets/iD/iD.css.erb index 7c395f892..c9d34b827 100644 --- a/vendor/assets/iD/iD.css.erb +++ b/vendor/assets/iD/iD.css.erb @@ -820,8 +820,8 @@ path.fill.tag-landuse-grass.tag-golf-green, path.fill.tag-landuse-meadow, path.fill.tag-landuse-orchard, path.fill.tag-landuse-vineyard { - stroke: rgb(191, 232, 63, 0.3); - fill: rgb(191, 232, 63, 0.3); + stroke: rgba(191, 232, 63, 0.3); + fill: rgba(191, 232, 63, 0.3); } .preset-icon-fill path.area.fill.tag-landuse-cemetery, .preset-icon-fill path.area.fill.tag-landuse-farmland,