Merge remote-tracking branch 'upstream/pull/2991' into master

diff --git a/app/views/diary_entries/_diary_entry.html.erb b/app/views/diary_entries/_diary_entry.html.erb
index 48df5d18e06a974c4cfc6d124b353161d4f25799..6616417a19e31cb8d654ea23074617fc31e01c66 100644 (file)
--- a/app/views/diary_entries/_diary_entry.html.erb
+++ b/app/views/diary_entries/_diary_entry.html.erb
@@ -8,6 +8,9 @@
 
     <small class='text-muted'>
       <%= t(".posted_by_html", :link_user => (link_to diary_entry.user.display_name, user_path(diary_entry.user)), :created => l(diary_entry.created_at, :format => :blog), :language_link => (link_to diary_entry.language.name, :controller => "diary_entries", :action => "index", :display_name => nil, :language => diary_entry.language_code)) %>
+      <% if (l(diary_entry.updated_at, :format => :blog) != l(diary_entry.created_at, :format => :blog)) %>
+        <%= t(".updated_at_html", :updated => l(diary_entry.updated_at, :format => :blog)) %>
+      <% end %>
     </small>
 
   </div>

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 9d06e1df5b87a084d85ff0d87b7bb5619cc597be..3b8d5ec52e42114380e6b44a75427dea5f152399 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1485,13 +1485,13 @@ cs:
       greeting: Dobrý den,
       hopefully_you: Někdo (snad vy) požádal o změnu e-mailové adresy na serveru %{server_url}
         na %{new_address}.
-      click_the_link: Pokud jste to byli vy, potvrďte změnu kliknutím na následující
+      click_the_link: Pokud jste to byli Vy, potvrďte změnu kliknutím na následující
         odkaz.
     email_confirm_html:
       greeting: Dobrý den,
       hopefully_you: Někdo (snad vy) požádal o změnu e-mailové adresy na serveru %{server_url}
         na %{new_address}.
-      click_the_link: Pokud jste to byli vy, potvrďte změnu kliknutím na následující
+      click_the_link: Pokud jste to byli Vy, potvrďte změnu kliknutím na následující
         odkaz.
     lost_password:
       subject: '[OpenStreetMap] Žádost o nové heslo'
@@ -1499,14 +1499,14 @@ cs:
       greeting: Dobrý den,
       hopefully_you: Někdo (patrně vy) požádal o vygenerování nového hesla pro uživatele
         serveru openstreetmap.org s touto e-mailovou adresou.
-      click_the_link: Pokud tedy chcete, kliknutím na níže uvedený odkaz získáte nové
-        heslo.
+      click_the_link: Pokud jste to byli Vy, kliknutím na níže uvedený odkaz získáte
+        nové heslo.
     lost_password_html:
       greeting: Ahoj,
       hopefully_you: Někdo (patrně vy) požádal o vygenerování nového hesla pro uživatele
         serveru openstreetmap.org s touto e-mailovou adresou.
-      click_the_link: Pokud tedy chcete, kliknutím na níže uvedený odkaz získáte nové
-        heslo.
+      click_the_link: Pokud jste to byli Vy, kliknutím na níže uvedený odkaz získáte
+        nové heslo.
     note_comment_notification:
       anonymous: Anonymní uživatel
       greeting: Ahoj,

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 7e7302e7983fa85e5c71055eef999ccd9525db16..31b23e3b8104d2dc7edbe6a0fc16acf4e95f6ab4 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -433,7 +433,8 @@ en:
       heading: "No entry with the id: %{id}"
       body: "Sorry, there is no diary entry or comment with the id %{id}. Please check your spelling, or maybe the link you clicked is wrong."
     diary_entry:
-      posted_by_html: "Posted by %{link_user} on %{created} in %{language_link}"
+      posted_by_html: "Posted by %{link_user} on %{created} in %{language_link}."
+      updated_at_html: "Last updated on %{updated}."
       comment_link: Comment on this entry
       reply_link: Send a message to the author
       comment_count:

diff --git a/config/locales/es.yml b/config/locales/es.yml
index d7bfd4044789f4f7778a1682d66ce8958402ef04..fda3690b46361f49e63d2ee3f3683593669301a9 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1317,12 +1317,15 @@ es:
           "yes": Curso de agua
       admin_levels:
         level2: Límite de país
+        level3: Límite regional
         level4: Límite de estado
         level5: Límite de región
         level6: Límite de provincia
+        level7: Límite municipal
         level8: Límite de ciudad
         level9: Límite de pueblo
         level10: Límite de suburbio
+        level11: Límite vecinal
       types:
         cities: Ciudades
         towns: Municipios
@@ -1509,6 +1512,7 @@ es:
       import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures
       subject: '[OpenStreetMap] Fallo al importar GPX'
     gpx_success:
+      hi: 'Hola, %{to_user}:'
       loaded_successfully: '{{PLURAL|one=cargado correctamente con %{trace_points}
         de 1 punto posible.|carga exitosa con %{trace_points} de %{possible_points}
         puntos posibles.'

diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index 81a4cfe6812e998746a6b06ac04b06d7e42a3056..63073ae7e1019f1c730cd59dfbd43aea619c9f0d 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -837,7 +837,7 @@ fa:
           wayside_cross: صلیب کنار جاده
           wayside_shrine: مقبره کنار جاده
           wreck: لاشه
-          "yes": محوطه تاریخی
+          "yes": مکان تاریخی
         junction:
           "yes": تقاطع
         landuse:

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 5cff3f7cced43ee10d02267bb06a4d27a8721435..681aaa6e3a5e05c605e37601351570062248b037 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -517,7 +517,8 @@ fr:
         %{id}. Veuillez vérifier votre orthographe ou la validité du lien que vous
         avez cliqué.
     diary_entry:
-      posted_by_html: Publié par %{link_user} le %{created} en %{language_link}
+      posted_by_html: Publié par %{link_user} le %{created} en %{language_link}.
+      updated_at_html: Dernière mise à jour le %{updated}.
       comment_link: Commenter cette entrée
       reply_link: Envoyer un message à l’auteur
       comment_count:
@@ -1330,12 +1331,15 @@ fr:
           "yes": Cours d’eau
       admin_levels:
         level2: Frontière de pays
+        level3: Limite de région
         level4: Limite d’État, province ou région
         level5: Limite de région
         level6: Limite de département ou province
+        level7: Limite d'arrondissement
         level8: Limite communale
         level9: Limite de village ou arrondissement municipal
         level10: Limite de quartier
+        level11: Limite de voisinage
       types:
         cities: Villes
         towns: Villages

diff --git a/config/locales/it.yml b/config/locales/it.yml
index f4739dd3d02e42febd4ad6e953b2130b73166c44..cf90f26ee263a3522020e06413a1c242d54b0c72 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -488,7 +488,7 @@ it:
         %{id}. Controlla la digitazione, oppure potrebbe essere che il collegamento
         che si è seguito sia errato.
     diary_entry:
-      posted_by_html: Pubblicato da %{link_user} il %{created} in %{language_link}
+      posted_by_html: Pubblicato da %{link_user} il %{created} in %{language_link}.
       comment_link: Commenta questa voce
       reply_link: Invia un messaggio all'autore
       comment_count:

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 784163639db762e9f103c382e3173500714416df..23ffb8a18bb063eef607b9832574df7c5ffde943 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -1259,12 +1259,15 @@ mk:
           "yes": Воден пат
       admin_levels:
         level2: Државна граница
+        level3: Регионална граница
         level4: Покраинска граница
         level5: Регионална граница
         level6: Окружна граница
+        level7: Општинска граница
         level8: Градска граница
         level9: Селска граница
         level10: Населбена граница
+        level11: Маалска граница
       types:
         cities: Градови
         towns: Гратчиња

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 5aa0680f5c4e1530236214e6f41c33a396bbc5e9..069e222b6c8ea385a212c1ccb90b6bc13207424b 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1323,7 +1323,7 @@ pl:
           artificial: Sztuczne zbiorniki wodne
           boatyard: Stocznia
           canal: Kanał
-          dam: Tama
+          dam: Zapora wodna
           derelict_canal: Opuszczony kanał
           ditch: Rów przydrożny
           dock: Basen portowy

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 1d73e25b0bb90a49aee0cf21e260ac630ba1acb4..7bda477b441a86770fd49605fcb3530502b91e31 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -487,7 +487,8 @@ pt-BR:
       body: Não há postagens no diário ou comentário com o id %{id}. Confira a digitação,
         ou talvez o link clicado esteja errado.
     diary_entry:
-      posted_by_html: Publicado por %{link_user} em %{created} em %{language_link}
+      posted_by_html: Publicado por %{link_user} em %{created} em %{language_link}.
+      updated_at_html: Última atualização em %{updated}.
       comment_link: Comentar nesta publicação
       reply_link: Enviar uma mensagem ao autor
       comment_count:

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index d0249c92aa82cb254283a5313f6ad3cf14010cbe..90e5dcd3b31a83c8e502e04353dae5160991cf1b 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -61,6 +61,7 @@
 # Author: Okras
 # Author: Pacha Tchernof
 # Author: Perevod16
+# Author: PlushBoy
 # Author: Putnik
 # Author: Redredsonia
 # Author: Riliam
@@ -200,6 +201,7 @@ ru:
         body: Текст
         recipient: Получатель
       report:
+        category: 'Выберите причину вашего сообщения:'
         details: Пожалуйста, сообщите немного больше деталей о проблеме (обязательно).
       user:
         email: Адрес электронной почты
@@ -378,6 +380,7 @@ ru:
         changeset: пакет правок
         note: заметка
     timeout:
+      title: Тайм-аут ошибка
       sorry: Извините, данные для %{type} с id %{id} требуют слишком много времени
         для извлечения.
       type:
@@ -512,7 +515,7 @@ ru:
       body: К сожалению, нет записи или комментария с номером %{id}. Проверьте правильность
         написания. Или, возможно, ссылка, по которой вы перешли, ошибочна.
     diary_entry:
-      posted_by_html: Опубликован %{link_user} %{created} на языке %{language_link}
+      posted_by_html: Опубликован %{link_user} %{created} на языке %{language_link}.
       comment_link: Оставить комментарий
       reply_link: Написать автору
       comment_count:
@@ -611,6 +614,7 @@ ru:
           bicycle_rental: Прокат велосипедов
           bicycle_repair_station: Ремонтная станция велосипедов
           biergarten: Пивная на открытом воздухе
+          blood_bank: Банк крови
           boat_rental: Прокат лодок
           brothel: Бордель
           bureau_de_change: Обмен валют
@@ -627,6 +631,7 @@ ru:
           clock: Часы
           college: Колледж
           community_centre: Общественный центр
+          conference_centre: Конференц-центр
           courthouse: Суд
           crematorium: Крематорий
           dentist: Стоматология
@@ -650,6 +655,7 @@ ru:
           kindergarten: Детский сад
           language_school: Языковая школа
           library: Библиотека
+          loading_dock: Загрузочный док
           love_hotel: Отель любви
           marketplace: Рынок
           monastery: Монастырь
@@ -706,6 +712,8 @@ ru:
           "yes": Мост
         building:
           apartments: Многоквартирный дом
+          bungalow: Бунгало
+          cabin: Хижина
           chapel: Часовня
           church: Церковь
           commercial: Офисное здание
@@ -720,6 +728,7 @@ ru:
           house: Дом
           industrial: Промышленное здание
           kindergarten: Детский сад
+          manufacture: Промышленное здание
           office: Офисное здание
           public: Общественное здание
           residential: Жилой дом

diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 611f0bc8b73366a3b7253cc82154e9864aad17d3..6a1dbf66043554c77183ffaa90f3caa86b39aa34 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -8,6 +8,7 @@
 # Author: Ainali
 # Author: Balp
 # Author: Bengtsson96
+# Author: Carlbacker
 # Author: Cohan
 # Author: Cybjit
 # Author: Dan Koehl
@@ -669,6 +670,7 @@ sv:
           townhall: Rådhus
           training: Träningsanstalt
           university: Universitet
+          vehicle_inspection: Fordonsbesiktning
           vending_machine: Varuautomat
           veterinary: Veterinärkirurgi
           village_hall: Byastuga

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index fc71b926437a1ca43179b9d7dbd773a8e8a2d347..2ad1f7a6b0915b5a6e29bf74d6f5a689bf3c6ced 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -492,7 +492,8 @@ tr:
         kontrol edin ya da tıkladığınız link yanlış olabilir.
     diary_entry:
       posted_by_html: '%{link_user} tarafından %{created} tarihinde %{language_link}
-        dilinde gönderildi'
+        dilinde gönderildi.'
+      updated_at_html: En son %{updated} tarihinde güncellendi.
       comment_link: Bu girdiyi yorumla
       reply_link: Yazara mesaj gönder
       comment_count:
@@ -1307,12 +1308,15 @@ tr:
           "yes": Suyolu
       admin_levels:
         level2: Ülke Sınırı
+        level3: Bölge Sınırı
         level4: Eyalet Sınırı
         level5: Bölge Sınırı
         level6: İlçe Sınırı
+        level7: Belediye Sınırı
         level8: Şehir Sınırı
         level9: Köy Sınırı
         level10: Mahalle Sınırı
+        level11: Mahalle Sınırı
       types:
         cities: Büyükşehirler
         towns: Şehirler

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 350590c91a1ac2edd0e258e2ac790e36cb62410b..a7b0b122b299f7986dde0aaa37bf29fc16d2b338 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -472,7 +472,8 @@ zh-TW:
       heading: 沒有 id 為 %{id} 的項目
       body: 抱歉，沒有日記項目或評論的 id 是 %{id}。請檢查您的拼字，或者可能是您按到錯誤的連結。
     diary_entry:
-      posted_by_html: 於 %{created} 由 %{link_user} 以%{language_link}發表
+      posted_by_html: 於 %{created} 由 %{link_user} 以%{language_link}發表。
+      updated_at_html: 上一次更新在 %{updated}。
       comment_link: 對這個項目的評論
       reply_link: 發送訊息給作者
       comment_count:
@@ -1285,12 +1286,15 @@ zh-TW:
           "yes": 水道
       admin_levels:
         level2: 國界
+        level3: 區界
         level4: 省界
         level5: 區界
         level6: 縣界
+        level7: 自治市界
         level8: 市界
         level9: 村里界
         level10: 郊區邊界
+        level11: 社區邊界
       types:
         cities: 城市
         towns: 鄉鎮