]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 7a81258)
Merge remote-tracking branch 'upstream/pull/2475'
authorTom Hughes <tom@compton.nu>
Sun, 29 Dec 2019 19:16:33 +0000 (19:16 +0000)
committerTom Hughes <tom@compton.nu>
Sun, 29 Dec 2019 19:16:33 +0000 (19:16 +0000)
app/views/layouts/_flash.html.erb patch | blob | history
app/views/layouts/_header.html.erb patch | blob | history
app/views/layouts/error.html.erb patch | blob | history
config/locales/fit.yml patch | blob | history
config/locales/sr.yml patch | blob | history
config/locales/tr.yml patch | blob | history
vendor/assets/iD/iD.css.erb patch | blob | history

diff --git a/app/views/layouts/_flash.html.erb b/app/views/layouts/_flash.html.erb
index 8b04dac91d465f44844ffe7145519c9375c70732..0f39c4a47f3f7d0df5f415422e4fc749ff5d1615 100644 (file)
--- a/app/views/layouts/_flash.html.erb
+++ b/app/views/layouts/_flash.html.erb
@@ -1,7 +1,7 @@
 <% if flash[:error] %>
   <div class="flash error">
     <picture>
-      <source srcset="<%= image_path "notice.svg" %>" type="image/svg+xml"></source>
+      <source srcset="<%= image_path "notice.svg" %>" type="image/svg+xml" />
       <%= image_tag("notice.png", :srcset => image_path("notice.svg"), :class => "small_icon", :border => 0) %>
     </picture>
     <div class="message"><%= flash[:error] %></div>
diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb
index c95cc4a75d447375c544c3b38d1a5a22e1dd6a4f..6df8f02da2a1e43a0227a9a9ff583aae19e667de 100644 (file)
--- a/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@ -2,7 +2,7 @@
   <h1>
     <a href="<%= root_path %>" class="geolink">
       <picture>
-        <source srcset="<%= image_path "osm_logo.svg" %>" type="image/svg+xml"></source>
+        <source srcset="<%= image_path "osm_logo.svg" %>" type="image/svg+xml" />
         <%= image_tag "osm_logo.png", :srcset => image_path("osm_logo.svg"), :alt => t("layouts.logo.alt_text"), :class => "logo" %>
       </picture>
       <%= t "layouts.project_name.h1" %>
diff --git a/app/views/layouts/error.html.erb b/app/views/layouts/error.html.erb
index 9b5f4f34b9536718974ceecadb42a36372f55f42..2b769958e5018d536aff6c5c195f952e211e6d7e 100644 (file)
--- a/app/views/layouts/error.html.erb
+++ b/app/views/layouts/error.html.erb
@@ -8,7 +8,7 @@
   <body>
     <a href="<%= root_path %>">
       <picture>
-        <source srcset="<%= image_path "osm_logo.svg" %>" type="image/svg+xml"></source>
+        <source srcset="<%= image_path "osm_logo.svg" %>" type="image/svg+xml" />
         <%= image_tag "osm_logo.png", :srcset => image_path("osm_logo.svg"), :alt => t("layouts.logo.alt_text"), :class => "logo" %>
       </picture>
     </a>
diff --git a/config/locales/fit.yml b/config/locales/fit.yml
index e50595f633bea7c0193d5ee19682007c58953872..7f99b515910681b0b451f72566add0f393cd899d 100644 (file)
--- 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 d8ccb7f10ca58f618120fec15b124d454452fdfa..33d9b9bf92a7353dbf77487d9cec797560478218 100644 (file)
--- 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} Ñ\80азÑ\80еÑ\88ио Ð¿Ñ\80е %{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} Ñ\98е Ñ\80еÑ\88ио/-ла Ñ\83 %{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: Направљено пре <abbr title='%{title}'>%{time}</abbr>
-    closed_html: Затворено пре <abbr title='%{title}'>%{time}</abbr>
-    created_by_html: Направио %{user} пре <abbr title='%{title}'>%{time}</abbr>
-    deleted_by_html: Избрисао %{user} пре <abbr title='%{title}'>%{time}</abbr>
-    edited_by_html: Уредио корисник %{user} пре <abbr title='%{title}'>%{time}</abbr>
+    created_html: Направљено у <abbr title='%{title}'>%{time}</abbr>
+    closed_html: Затворено у <abbr title='%{title}'>%{time}</abbr>
+    created_by_html: '%{user} је направио/-ла у <abbr title=''%{title}''>%{time}</abbr>'
+    deleted_by_html: '%{user} је избрисао/-ла у <abbr title=''%{title}''>%{time}</abbr>'
+    edited_by_html: '%{user} је уредио/-ла у <abbr title=''%{title}''>%{time}</abbr>'
     closed_by_html: Затворио корисник %{user} пре <abbr title='%{title}'>%{time}</abbr>
     version: Верзија
     in_changeset: Скуп промена
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 1c7f6061d813038b9ac42729fa4fab3558c1b182..e56aa3eafd68ef81cc85e43f214cfe8555a8ae29 100644 (file)
--- 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 7c395f892805c12a3b2762cf6d3224999f93fbcc..c9d34b82747e986047c720ce4822d86699025ec0 100644 (file)
--- 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,
The OpenStreetMap web site