Localisation updates from https://translatewiki.net.

config/locales/af.yml

@@ -407,6 +407,11 @@ af:
       join_discussion: Meld aan en gesels saam
       still_open: Wysigingstel is steeds oop - bespreking sal oopmaak sodra die wysigingstel
         gesluit is.
+      subscribe: Skryf in
+      unsubscribe: Kanselleer subskripsie
+      hide_comment: versteek
+      unhide_comment: bring weer aan die lig
+      comment: Reageer
       changesetxml: Wysigingstel XML
       osmchangexml: osmWysiging XML
     paging_nav:
@@ -1598,10 +1603,6 @@ af:
         credit_title_html: Hoe om na OpenStreetMap te verwys
         contributors_title_html: Ons bydraers
         infringement_title_html: Kopieregoortreding
-    index:
-      permalink: Perma-skakel
-      shortlink: Kortskakel
-      createnote: Voeg 'n nota by
     edit:
       user_page_link: gebruikersbladsy
       anon_edits_link_text: Lees waarom dit so is.
@@ -2114,13 +2115,6 @@ af:
       map_data_zoom_in_tooltip: Zoem in om kaartdata te sien
       queryfeature_tooltip: Soek bakens op
       queryfeature_disabled_tooltip: Zoem in om bakens te zoek
-    changesets:
-      show:
-        comment: Reageer
-        subscribe: Skryf in
-        unsubscribe: Kanselleer subskripsie
-        hide_comment: versteek
-        unhide_comment: bring weer aan die lig
     directions:
       engines:
         fossgis_osrm_car: Kar (OSRM)

config/locales/aln.yml

@@ -855,8 +855,6 @@ aln:
       js_1: Ju jeni duke përdorur ndonjë shfletues që nuk e përkrah JavaScript, ose
         i keni çativizuar JavaScript.
       js_2: OpenStreetMap përdor Java skriptet për planet e saj të rrëshqitshëm.
-      permalink: Permalink
-      shortlink: Shortlink
     edit:
       not_public: Ju nuk keni vendosur redaktimet e juaj të jetë publike.
       not_public_description_html: Ju nuk mund të redaktoni hartën e nëse ju një gjë

config/locales/ar.yml

@@ -561,8 +561,13 @@ ar:
       join_discussion: ادخل للاشتراك في المناقشة
       still_open: ما زالت مجموعة التغييرات مفتوحة - سيتم فتح المناقشة بمجرد إغلاق
         مجموعة التغييرات.
+      subscribe: اشترك
+      unsubscribe: إلغاء الاشتراك
       comment_by_html: تعليق من %{user}%{time_ago}
       hidden_comment_by_html: تعليق مخفي من%{time_ago} %{user}
+      hide_comment: إخفاء
+      unhide_comment: أظهر
+      comment: التعليق
       changesetxml: حزمة التغييرات XML
       osmchangexml: osmChange XML
     paging_nav:
@@ -2075,9 +2080,6 @@ ar:
     index:
       js_1: إما أنك تستخدم متصفحا لا يدعم جافا سكريبت، أو أنك عطلت استعمال جافا سكريبت.
       js_2: خريطة الشارع المفتوحة تستخدم جافا سكريبت لخريطتها المنزلقة.
-      permalink: وصلة دائمة
-      shortlink: وصلة قصيرة
-      createnote: أضف ملاحظة
       license:
         copyright: حقوق طبع ونشر ومساهمو خريطة الشارع المفتوحة، تحت رخصة مفتوحة
       remote_failed: فشل التعديل - تأكد من تحميل JOSM أو Merkaartor وتمكين خيار التحكم
@@ -2812,13 +2814,6 @@ ar:
       map_data_zoom_in_tooltip: تكبير الخريطة لرؤية بيانات الخريطة
       queryfeature_tooltip: ميزات الاستعلام
       queryfeature_disabled_tooltip: ميزات تكبير الاستعلام
-    changesets:
-      show:
-        comment: التعليق
-        subscribe: اشترك
-        unsubscribe: إلغاء الاشتراك
-        hide_comment: إخفاء
-        unhide_comment: أظهر
     edit_help: انقل الخريطة وكبر الموقع الذي تريد تحريره، ثم اضغط هنا.
     directions:
       ascend: رفع

config/locales/arz.yml

@@ -727,8 +727,6 @@ arz:
     index:
       js_1: أنت إما تستخدم متصفح لا يدعم جافا سكريبت، أو أنك عطلت استعمال جافا سكريبت.
       js_2: خريطه الشارع المفتوحه تستخدم جافا سكريبت لخريطتها المنزلقه.
-      permalink: وصله دائمة
-      shortlink: وصله قصيرة
     edit:
       not_public: لم تقم بتعيين تعديلاتك لتظهر بشكل علنى.
       not_public_description_html: أنت لم تعد قادر على تعديل الخريطه إلا إذا قمت بذلك.

config/locales/ast.yml

@@ -375,6 +375,11 @@ ast:
       join_discussion: Anicia sesión pa xunite al alderique
       still_open: El conxuntu de cambios inda ta abiertu; l'alderique abriráse en
         zarrando'l conxuntu de cambios.
+      subscribe: Suscribite
+      unsubscribe: Date de baxa
+      hide_comment: anubrir
+      unhide_comment: amosar
+      comment: Comentar
       changesetxml: Conxuntu de cambeos XML
       osmchangexml: osmChange XML
     paging_nav:
@@ -1530,9 +1535,6 @@ ast:
       js_1: O tas usando un restolador ensin sofitu pa JavaScript, o tienes JavaScript
         desactiváu.
       js_2: OpenStreetMap usa JavaScript pal so mapa eslizante.
-      permalink: Enllaz permanente
-      shortlink: Enllaz curtiu
-      createnote: Amestar una nota
       license:
         copyright: Copyright OpenStreetMap y collaboradores, baxo una llicencia abierta
       remote_failed: Falló la edición - asegúrate de tener cargáu JOSM o Merkaartor
@@ -2240,13 +2242,6 @@ ast:
       map_data_zoom_in_tooltip: Averar pa ver los datos del mapa
       queryfeature_tooltip: Consultar entidaes
       queryfeature_disabled_tooltip: Averar pa consultar entidaes
-    changesets:
-      show:
-        comment: Comentar
-        subscribe: Suscribite
-        unsubscribe: Date de baxa
-        hide_comment: anubrir
-        unhide_comment: amosar
     edit_help: Mueve'l mapa y amplía al llugar que quies editar, llueu calca equí.
     directions:
       ascend: Ascender

config/locales/az.yml

@@ -940,8 +940,6 @@ az:
         more_title_html: Daha ətraflı öyrən
         contributors_title_html: Kimlər bizim layihəyə töhfə verir
         infringement_title_html: Müəllif hüquqlarının pozulması
-    index:
-      shortlink: Qısa keçid
     edit:
       user_page_link: istifadəçi səhifəsi
     export:

config/locales/be-Tarask.yml

@@ -1110,8 +1110,6 @@ be-Tarask:
     index:
       js_1: Вы карыстаецеся браўзэрам, які не падтрымлівае ці мае забаронены JavaScript.
       js_2: OpenStreetMap выкарыстоўвае JavaScript для паказу мапы.
-      permalink: Сталая спасылка
-      shortlink: Кароткая спасылка
       remote_failed: Памылка рэдагаваньня. Упэўніцеся, што JOSM ці Merkaartor загружаныя
         і дазволеная магчымасьць аддаленага кіраваньня
     edit:

config/locales/be.yml

@@ -484,6 +484,11 @@ be:
       join_discussion: Увайдзіце ў сістэму, каб далучыцца да абмеркавання
       still_open: Пакет правак яшчэ адкрыты. Абмеркаванне стане даступным, як толькі
         пакет правак закрыецца.
+      subscribe: Падпісацца
+      unsubscribe: Адпісацца
+      hide_comment: схаваць
+      unhide_comment: паказаць
+      comment: Каментаваць
       changesetxml: XML пакета правак
       osmchangexml: osmChange XML
     paging_nav:
@@ -1699,9 +1704,6 @@ be:
     index:
       js_1: Вы карыстаецеся вандроўнікам без падтрымкі JavaScript.
       js_2: OpenStreetMap выкарыстоўвае JavaScript для адлюстравання карты на сайце.
-      permalink: Спасылка сюды
-      shortlink: Кароткая
-      createnote: Дадаць заўвагу
       license:
         copyright: Аўтарскія правы належаць OpenStreetMap і яго ўдзельнікам на ўмовах
           адкрытай ліцэнзіі.
@@ -2441,13 +2443,6 @@ be:
       map_data_zoom_in_tooltip: Павялічце, каб убачыць картаграфічныя даныя
       queryfeature_tooltip: Пошук аб’ектаў
       queryfeature_disabled_tooltip: Наблізіцеся для пошуку аб'ектаў
-    changesets:
-      show:
-        comment: Каментаваць
-        subscribe: Падпісацца
-        unsubscribe: Адпісацца
-        hide_comment: схаваць
-        unhide_comment: паказаць
     edit_help: Перамясціце карту і наблізце месца, якое вы хочаце рэдагаваць, затым
       націсніце тут.
     directions:

config/locales/bg.yml

@@ -406,6 +406,11 @@ bg:
       join_discussion: Впишете се, за да се присъедините към обсъждането
       still_open: Списъкът с промени не е завършен - обсъждането ще започне след неговото
         завършване.
+      subscribe: Абониране
+      unsubscribe: Отписване
+      hide_comment: скриване
+      unhide_comment: показване
+      comment: Коментиране
       changesetxml: XML на списъка с промени
       osmchangexml: osmChange XML
     paging_nav:
@@ -1578,9 +1583,6 @@ bg:
         trademarks_1_1_trademark_policy: политика за търговски марки
     index:
       js_2: OpenStreetMap използва JavaScript за своята статична карта.
-      permalink: Постоянна връзка
-      shortlink: Къса връзка
-      createnote: Добавяне на бележка
     edit:
       not_public: Не сте посочили вашите редакции да бъдат публични.
       user_page_link: Потребителска страница
@@ -2158,13 +2160,6 @@ bg:
       map_data_zoom_in_tooltip: Увеличете за подробности
       queryfeature_tooltip: Търсене на обекти
       queryfeature_disabled_tooltip: Увеличете за търсене на обекти
-    changesets:
-      show:
-        comment: Коментиране
-        subscribe: Абониране
-        unsubscribe: Отписване
-        hide_comment: скриване
-        unhide_comment: показване
     directions:
       ascend: Изкачване
       engines:

config/locales/bn.yml

@@ -474,6 +474,7 @@ bn:
       join_discussion: আলোচনায় যোগ দিতে প্রবেশ করুন
       still_open: চেঞ্জসেট এখনও খোলা - চেঞ্জসেট বন্ধ হয়ে গেলে আলোচনা খোলা হবে।
       hidden_comment_by_html: '%{user} %{time_ago} মন্তব্যটি লুকিয়েছেন'
+      comment: মন্তব্য
       changesetxml: পরিবর্তনধার্য এক্সএমএল
       osmchangexml: osmChange এক্সএমএল
     paging_nav:
@@ -1628,9 +1629,6 @@ bn:
     index:
       js_1: আপনি এমন একটি ব্রাউজার ব্যবহার করছেন যা জাভাস্ক্রিপ্ট সমর্থন করে না অথবা
         আপনি জাভাস্ক্রিপ্ট অক্ষম করেছেন।
-      permalink: স্থায়ী সংযোগ
-      shortlink: সংক্ষিপ্ত সংযোগ
-      createnote: একটি দ্রষ্টব্য যোগ করুন
     edit:
       user_page_link: ব্যবহারকারীর পাতা
     export:
@@ -2078,9 +2076,6 @@ bn:
     site:
       edit_tooltip: মানচিত্রটি সম্পাদনা করুন
       embed_html_disabled: এই মানচিত্রের স্তরের জন্য এইচটিএমএল এম্বেডিং উপলব্ধ নয়।
-    changesets:
-      show:
-        comment: মন্তব্য
     directions:
       engines:
         graphhopper_car: গাড়ি (GraphHopper)

config/locales/br.yml

@@ -526,8 +526,13 @@ br:
       join_discussion: Kevreit evit mont er gaozeadenn
       still_open: Hollad cheñchamantoù digor - an diviz a zigoro ur wech ma vo serret
         an hollad cheñchamantoù.
+      subscribe: Koumanantiñ
+      unsubscribe: Digoumanantiñ
       comment_by_html: Kemennadenn skrivet gant %{user} %{time_ago}
       hidden_comment_by_html: Kemennadenn kuzhet gant %{user} %{time_ago}
+      hide_comment: kuzhat
+      unhide_comment: diskouez
+      comment: Embann
       changesetxml: Hollad cheñchamantoù XML
       osmchangexml: Cheñchoùosm XML
     paging_nav:
@@ -2092,9 +2097,6 @@ br:
       js_1: Pe emaoc'h oc'h implijout ur merdeer ha ne skor ket JavaScript, pe hoc'h
         eus diweredekaet JavaScript.
       js_2: OpenStreetMap a implij JavaScript evit e gartenn risklus.
-      permalink: Peurliamm
-      shortlink: Liamm berr
-      createnote: Ouzhpennañ un notenn
       license:
         copyright: Gwir-eilañ gant OpenStreetMap hag ar genlabourerien, dindan un
           aotre-implijout digor
@@ -3074,13 +3076,6 @@ br:
       map_data_zoom_in_tooltip: Zoumiñ evit gwelet roadennoù ar gartenn
       queryfeature_tooltip: Arc'hweladurioù enklask
       queryfeature_disabled_tooltip: Zoumañ evit an arc'hweladurioù enklask
-    changesets:
-      show:
-        comment: Embann
-        subscribe: Koumanantiñ
-        unsubscribe: Digoumanantiñ
-        hide_comment: kuzhat
-        unhide_comment: diskouez
     edit_help: Dilec'hiit ar gartenn ha zoumit war ul lec'h a fell deoc'h aozañ, ha
       neuze klikit amañ.
     directions:

config/locales/bs.yml

@@ -1100,9 +1100,6 @@ bs:
       js_1: Koristite internet preglednik koji ne podržava JavaScript, ili ste onemogućili
         JavaScript.
       js_2: OpenStreetMap koristi JavaScript za slippy kartu.
-      permalink: Trajni link
-      shortlink: Kratki link
-      createnote: Dodaj bilješku
       license:
         copyright: Autorska prava OpenStreetMap i doprinosioci, pod otvorenom dozvolom
       remote_failed: Uređivanje nije uspjelo - provjerite da li je JOSM ili Merkaartor

config/locales/ca.yml

@@ -503,8 +503,13 @@ ca:
       join_discussion: Inicieu una sessió per a unir-vos al debat
       still_open: Conjunt de canvis encara obert - el debat començarà quan es tanqui
         el conjunt de canvis.
+      subscribe: Subscriure's
+      unsubscribe: Dona de baixa
       comment_by_html: Comentari de %{user} %{time_ago}
       hidden_comment_by_html: Comentari ocult de %{user} %{time_ago}
+      hide_comment: ocultar
+      unhide_comment: mostrar
+      comment: Comenta
       changesetxml: XML del conjunt de canvis
       osmchangexml: XML en format osmChange
     paging_nav:
@@ -2101,9 +2106,6 @@ ca:
       js_1: O bé esteu utilitzant un navegador no compatible amb JavaScript o bé teniu
         JavaScript deshabilitat.
       js_2: L'OpenStreetMap utilitza JavaScript per al mapa lliscant.
-      permalink: Enllaç permanent
-      shortlink: Enllaç curt
-      createnote: Afegeix una nota
       license:
         copyright: Copyright d'OpenStreetMap i els seus col·laboradors sota llicència
           oberta
@@ -3106,13 +3108,6 @@ ca:
       queryfeature_disabled_tooltip: Apropeu-vos per a consultar característiques
       embed_html_disabled: La incrustació d'HTML no està disponible per a aquesta
         capa de mapa
-    changesets:
-      show:
-        comment: Comenta
-        subscribe: Subscriure's
-        unsubscribe: Dona de baixa
-        hide_comment: ocultar
-        unhide_comment: mostrar
     edit_help: Moveu el mapa i feu zoom sobre una ubicació que vulgueu editar, i a
       continuació, feu clic aquí.
     directions:

config/locales/ce.yml

@@ -29,7 +29,7 @@ ce:
         update: Хийцам Ӏалашбе
       trace:
         create: Сервер тӀейаккха
-        update: Ӏалашбе хийцамаш
+        update: Хийцамаш дӀаӀалашбе
       user_block:
         create: Кхолла блок
         update: Карлайаккха блок
@@ -73,7 +73,7 @@ ce:
       way_tag: Сизан тег
     attributes:
       diary_comment:
-        body: Йоза
+        body: Текст
       diary_entry:
         user: Декъашхо
         title: Тема
@@ -96,7 +96,7 @@ ce:
       message:
         sender: Баийтинарг
         title: Тема
-        body: Йоза
+        body: Текст
         recipient: Кхаьчнарг
       user:
         email: Электронан пошт
@@ -174,7 +174,7 @@ ce:
         title: OpenStreetMap билгалонаш
       entry:
         comment: Коммент
-        full: Дуьззина йоза
+        full: Йуьззина текст
   accounts:
     edit:
       current email address: 'Карара электронан поштан адрес:'
@@ -295,6 +295,9 @@ ce:
       title: 'Нисдарш: %{id}'
       discussion: Дийцар
       join_discussion: Дийцарехь дакъалаца системин чугӀо
+      hide_comment: къайлайаккха
+      unhide_comment: гайта
+      comment: Коммент
       changesetxml: Нисдарийн XML
       osmchangexml: osmChange XML
     paging_nav:
@@ -977,11 +980,6 @@ ce:
     site:
       edit_tooltip: Нисде карта
       edit_disabled_tooltip: Хийцамашбан гергадаладе карта
-    changesets:
-      show:
-        comment: Коммент
-        hide_comment: къайлайаккха
-        unhide_comment: гайта
     directions:
       ascend: Хьала
       engines:

config/locales/cs.yml

@@ -565,8 +565,13 @@ cs:
       join_discussion: Chcete-li diskutovat, přihlaste se
       still_open: Sada změn je stále otevřená – diskuse se zpřístupní, jakmile bude
         sada změn uzavřena.
+      subscribe: Odebírat
+      unsubscribe: Zrušit odebírání
       comment_by_html: Komentář od uživatele %{user} %{time_ago}
       hidden_comment_by_html: Skrytý komentář od uživatele %{user} %{time_ago}
+      hide_comment: skrýt
+      unhide_comment: odkrýt
+      comment: Okomentovat
       changesetxml: Sada změn XML
       osmchangexml: osmChange XML
     paging_nav:
@@ -2266,9 +2271,6 @@ cs:
       js_1: Buď používáte prohlížeč bez podpory JavaScriptu, nebo máte JavaScript
         zakázaný.
       js_2: OpenStreetMap používá pro svou interaktivní mapu JavaScript.
-      permalink: Trvalý odkaz
-      shortlink: Krátký odkaz
-      createnote: Přidat poznámku
       license:
         copyright: Copyright OpenStreetMap a přispěvatelé, pod svobodnou licencí
       remote_failed: Editace se nezdařila – ujistěte se, že JOSM nebo Merkaartor běží
@@ -3318,13 +3320,6 @@ cs:
       queryfeature_tooltip: Průzkum prvků
       queryfeature_disabled_tooltip: Pro průzkum prvků přejděte na větší měřítko
       embed_html_disabled: HTML vkládání není pro tuto mapovou vrstvu k dispozici
-    changesets:
-      show:
-        comment: Okomentovat
-        subscribe: Odebírat
-        unsubscribe: Zrušit odebírání
-        hide_comment: skrýt
-        unhide_comment: odkrýt
     edit_help: Posuňte si mapu a zvětšete si místo, které chcete editovat, a klikněte
       zde.
     directions:

config/locales/cy.yml

@@ -365,6 +365,7 @@ cy:
     download_xml: Lawrlwytho XML
     view_history: Gweld hanes
     view_details: Gweld manylion
+    view_redaction_message: Gweld Neges Orchuddio
     location: Lleoliadː
     node:
       title_html: 'Nod: %{name}'
@@ -510,8 +511,13 @@ cy:
       join_discussion: Mewngofnodwch i ymuno â'r sgwrs
       still_open: Mae'r grŵp newid dal ar agor - bydd trafodaeth yn agor pan fydd
         y grŵp newid wedi cau.
+      subscribe: Tanysgrifio
+      unsubscribe: Dad-danysgrifio
       comment_by_html: Sylw gan %{user} %{time_ago}
       hidden_comment_by_html: Sylw cudd gan %{user} %{time_ago}
+      hide_comment: cuddio
+      unhide_comment: datguddio
+      comment: Sylw
       changesetxml: XML grŵp newid
       osmchangexml: XML osmChange
     paging_nav:
@@ -581,6 +587,8 @@ cy:
       title: Dyddiadur %{user} | %{title}
       user_title: Dyddiadur %{user}
       discussion: Sgwrs
+      subscribe: Tanysgrifio
+      unsubscribe: Dad-danysgrifio
       leave_a_comment: Sylw
       login_to_leave_a_comment_html: '%{login_link} i adael sylw'
       login: Mewngofnodi
@@ -675,6 +683,8 @@ cy:
       contact_the_community_html: '%{contact_link} â''r gymuned OpenStreetMap os ydych
         chi wedi dod o hyd i nam neu ddolen sydd wedi torri. Nodwch yr URL cywir o''ch
         cais.'
+    bad_request:
+      title: Cais Drwg
     forbidden:
       title: Gwaharddedig
     internal_server_error:
@@ -1529,6 +1539,7 @@ cy:
       sydd ar gael i'w ddefnyddio am ddim a dan drwydded rydd.
     intro_2_create_account: Creu cyfrif defnyddiwr
     partners_fastly: Fastly
+    partners_corpmembers: Aelodau corfforaethol OSMF
     partners_partners: phartneriaid
     tou: Telerau Gwasanaeth
     osm_offline: Mae cronfa ddata OpenStreetMap all-lein ar hyn o bryd er mwyn gwaith
@@ -1550,6 +1561,7 @@ cy:
     more: Mwy
   user_mailer:
     diary_comment_notification:
+      description: 'Cofnod Dyddiadur OpenStreetMap #%{id}'
       subject: '[OpenStreetMap] Gwnaeth %{user} sylw ar gofnod dyddiadur'
       hi: Helo %{to_user},
     message_notification:
@@ -1586,6 +1598,7 @@ cy:
       click_the_link: Os mai chi yw hwn, cliciwch ar y ddolen isod i ailosod eich
         cyfrinair.
     note_comment_notification:
+      description: 'Nodyn OpenStreetMap #%{id}'
       anonymous: Defnyddiwr dienw
       greeting: Helo,
       commented:
@@ -1607,8 +1620,8 @@ cy:
           ddiddordeb ynddo'
         your_note: Ailysgogodd %{commenter} un o'ch nodiadau map ger %{place}.
         your_note_html: Ailysgogodd %{commenter} un o'ch nodiadau map ger %{place}.
-      details: Ceir rhagor o fanylion am y nodyn ar %{url}.
+      details: 'Ateb neu ddysgu mwy am y nodyn: %{url}.'
-      details_html: Ceir rhagor o fanylion am y nodyn ar %{url}.
+      details_html: 'Ateb neu ddysgu mwy am y nodyn: %{url}.'
     changeset_comment_notification:
       description: 'Grŵp newid OpenStreetMap #%{id}'
       hi: Helo %{to_user},
@@ -1624,8 +1637,8 @@ cy:
         partial_changeset_with_comment: gyda sylw '%{changeset_comment}'
         partial_changeset_with_comment_html: gyda sylw '%{changeset_comment}'
         partial_changeset_without_comment: dim sylw
-      details: Ceir rhagor o fanylion am y grŵp newid ar %{url}.
+      details: 'Ateb neu ddysgu mwy am y grŵp newid: %{url}.'
-      details_html: Ceir rhagor o fanylion am y grŵp newid ar %{url}.
+      details_html: 'Ateb neu ddysgu mwy am y grŵp newid: %{url}.'
   confirmations:
     confirm:
       heading: Gwiriwch eich e-byst!
@@ -1772,13 +1785,15 @@ cy:
     new:
       title: Mewngofnodi
       tab_title: Mewngofnodi
+      login_to_authorize_html: Mewngofnodwch i OpenStreetMap i gael mynediad i %{client_app_name}.
       email or username: Cyfeiriad E-Bost neu Enw Defnyddiwr
       password: Cyfrinair
       remember: Cofiwch fi
       lost password link: Wedi anghofio eich cyfrinair?
       login_button: Mewngofnodi
       register now: Cofrestru nawr
-      with external: 'Fel arall, defnyddiwch drydydd parti i fewngofnodi:'
+      with external: neu fewngofnodi gyda thrydydd parti
+      or: neu
       auth failure: Mae'n ddrwg gennym, ni ellir mewngofnodi gyda'r manylion hynny.
     destroy:
       title: Allgofnodi
@@ -1904,6 +1919,7 @@ cy:
         contributors_fr_credit_html: '%{france}: Cynhwysir data gan Direction Générale
           des Impôts.'
         contributors_fr_france: Ffrainc
+        contributors_hr_croatia: Croatia
         contributors_nl_credit_html: '%{netherlands}: Cynhwysir data © AND, 2007
           (%{and_link})'
         contributors_nl_netherlands: Iseldiroedd
@@ -1929,9 +1945,6 @@ cy:
         trademarks_1_1_trademark_policy: Polisi Nod Masnach
     index:
       js_2: Mae OpenStreetMap yn defnyddio JavaScript ar gyfer ei fap llithrig.
-      permalink: Dolen barhaol
-      shortlink: Dolen fer
-      createnote: Ychwanegu nodyn
       license:
         copyright: Hawlfraint OpenStreetMap a chyfranwyr, dan drwydded agored
     edit:
@@ -2244,6 +2257,7 @@ cy:
     description:
       description_without_count: Ffeil GPX gan %{user}
   application:
+    oauth_10a_disabled: 'Analluogir OAuth 1.0 a 1.0a: %{link}'
     require_admin:
       not_an_admin: Mae rhaid ichi fod yn weinyddwr i gyflawni'r weithred honno.
     settings_menu:
@@ -2254,6 +2268,7 @@ cy:
       muted_users: Defnyddwyr ag Anwybyddwyd
     auth_providers:
       openid_logo_alt: Mewngofnodi gydag OpenID
+      openid_login_button: Parhau
       openid:
         title: Mewngofnodi ag OpenID
         alt: Mewngofnodi ag URL OpenID
@@ -2264,8 +2279,8 @@ cy:
         title: Mewngofnodi â Facebook
         alt: Mewngofnodi â Chyfrif Facebook
       microsoft:
-        title: Mewngofnodi gyda Microsoft
+        title: Mewngofnodi â Microsoft
-        alt: Mewngofnodi gyda Chyfrif Microsoft
+        alt: Mewngofnodi â Chyfrif Microsoft
       github:
         title: Mewngofnodi â GitHub
         alt: Mewngofnodi â Chyfrif GitHub
@@ -2377,16 +2392,22 @@ cy:
   users:
     new:
       title: Cofrestru
+      tab_title: Cofrestru
       support: cymorth
       about:
-        header: Rhydd ac agored
+        header: Rhydd a golygadwy.
+        paragraph_2: Cofrestrwch i ddechrau cyfrannu.
+        welcome: Croeso i OpenStreetMap
       display name description: Eich enw defnyddiwr cyhoeddus. Gallwch newid hyn yn
         nes ymlaen yn eich dewisiadau.
+      tou: telerau defnydd
       external auth: 'Dilysu Trydydd Parti:'
       continue: Cofrestru
       terms accepted: Diolch am dderbyn telerau newydd cyfranwyr!
       privacy_policy: polisi preifatrwydd
-      use external auth: Fel arall, defnyddiwch drydydd parti i fewngofnodi
+      consider_pd: parth cyhoeddus
+      or: neu
+      use external auth: neu gofrestru gyda thrydydd parti
     terms:
       title: Telerau
       heading: Telerau
@@ -2432,6 +2453,7 @@ cy:
       remove as friend: Dad-ffrindio
       add as friend: Ychwanegu ffrind
       mapper since: 'Yn mapio ers:'
+      last map edit: 'Golygiad map diwethaf:'
       uid: 'ID Defnyddiwr:'
       ct status: 'Telerau cyfrannwr:'
       ct undecided: Heb Benderfynu
@@ -2520,6 +2542,7 @@ cy:
       revoke: Dad-flocio!
     helper:
       time_future_html: Yn dod i ben mewn %{time}.
+      until_login: Gweithredol hyd nes bod y defnyddiwr yn mewngofnodi.
       time_past_html: Wedi dod i ben %{time} yn ôl.
       block_duration:
         hours:
@@ -2564,6 +2587,7 @@ cy:
       title: Blociau gan %{name}
       heading_html: Rhestr Blociau gan %{name}
     show:
+      heading_html: '%{block_on} a flociwyd gan %{block_by}'
       created: 'Crëwyd:'
       duration: 'Cyfnod:'
       status: 'Statws:'
@@ -2584,6 +2608,15 @@ cy:
       reason: Rheswm dros flocio
       status: Statws
       revoker_name: Dirymwyd gan
+      older: Blociau Hŷn
+      newer: Blociau Diweddarach
+    navigation:
+      all_blocks: Pob Bloc
+      blocks_on_me: Blociau arnaf i
+      blocks_on_user: Blociau ar %{user}
+      blocks_by_me: Blociau gennyf i
+      blocks_by_user: Blociau gan %{user}
+      block: 'Bloc #%{id}'
   user_mutes:
     index:
       title: Defnyddwyr ag Anwybyddwyd
@@ -2605,14 +2638,14 @@ cy:
     index:
       title: Nodiadau ag agorwyd neu y gwnaed sylw arnynt gan %{user}
       heading: Nodiadau %{user}
-      subheading_html: Nodiadau ag %{submitted} neu y %{commented} arnynt gan %{user}
+      subheading_html: Nodiadau %{submitted} neu %{commented} arnynt gan %{user}
-      subheading_submitted: cyflwynwyd
+      subheading_submitted: a gyflwynwyd
-      subheading_commented: rhoddwyd sylw
+      subheading_commented: y gwnaed sylw
       no_notes: Dim nodiadau
       id: Id
       creator: Crëwr
       description: Disgrifiad
-      created_at: Crëwyd am
+      created_at: Crëwyd
       last_changed: Newidiwyd ddiwethaf
     show:
       title: 'Nodyn: %{id}'
@@ -2649,6 +2682,10 @@ cy:
       intro: Ydych chi wedi sylwi ar gamgymeriad neu rywbeth sydd ar goll? Rhowch
         wybod i fapwyr eraill fel y gallwn ei ddatrys. Symudwch y marciwr i'r safle
         cywir ac ysgrifennwch nodyn i esbonio'r broblem.
+      anonymous_warning_html: Nid ydych chi wedi mewngofnodi. %{log_in} neu %{sign_up}
+        os ydych chi eisiau derbyn diweddariadau am eich nodyn.
+      anonymous_warning_log_in: Mewngofnodwch
+      anonymous_warning_sign_up: gofrestrwch
       advice: Mae eich nodyn yn gyhoeddus a gellid ei ddefnyddio i ddiweddaru'r map,
         felly peidiwch ag ysgrifennu gwybodaeth bersonol, na gwybodaeth o fapiau hawlfreintiedig
         neu gyfeiriaduron.
@@ -2717,13 +2754,6 @@ cy:
       map_data_zoom_in_tooltip: Chwyddwch mewn i weld data'r map
       queryfeature_tooltip: Manylion nodweddion
       queryfeature_disabled_tooltip: Chwyddwch i mewn i gael manylion nodweddion
-    changesets:
-      show:
-        comment: Sylw
-        subscribe: Tanysgrifio
-        unsubscribe: Dad-danysgrifio
-        hide_comment: cuddio
-        unhide_comment: datguddio
     directions:
       ascend: Esgyn
       engines:

config/locales/da.yml

@@ -498,8 +498,13 @@ da:
       join_discussion: Log på for at deltage i diskussionen
       still_open: Ændringssæt er stadig åben - diskussion vil åbne når ændringssættet
         lukkes.
+      subscribe: Abonnér
+      unsubscribe: Afmeld
       comment_by_html: Kommentar fra %{user} %{time_ago}
       hidden_comment_by_html: Skjult kommentar fra %{user} %{time_ago}
+      hide_comment: skjul
+      unhide_comment: fjern skjul
+      comment: Kommenter
       changesetxml: XML for ændringssæt
       osmchangexml: XML for osmChange
     paging_nav:
@@ -2172,9 +2177,6 @@ da:
       js_1: Du bruger enten en browser som ikke understøtter Javascript, eller du
         har deaktiveret Javascript.
       js_2: OpenStreetMap bruger JavaScript til det interaktive kort.
-      permalink: Permalink
-      shortlink: Kort link
-      createnote: Tilføj en bemærkning
       license:
         copyright: Ophavsret tilhører OpenStreetMap og bidragsydere, under en åben
           licens
@@ -3175,13 +3177,6 @@ da:
       queryfeature_tooltip: Find kortobjekter
       queryfeature_disabled_tooltip: Zoom ind for at finde kortobjekter
       embed_html_disabled: HTML-indlejring er ikke tilgængelig for dette kortlag
-    changesets:
-      show:
-        comment: Kommenter
-        subscribe: Abonnér
-        unsubscribe: Afmeld
-        hide_comment: skjul
-        unhide_comment: fjern skjul
     edit_help: Flyt kortet og zoom ind på et sted, du vil redigere, og klik så her.
     directions:
       ascend: Stigning

config/locales/de.yml

@@ -603,8 +603,13 @@ de:
       join_discussion: Anmelden, um mitzudiskutieren
       still_open: Der Änderungssatz ist noch offen. Die Diskussion wird eröffnet,
         sobald der Änderungssatz geschlossen ist.
+      subscribe: Abonnieren
+      unsubscribe: Abbestellen
       comment_by_html: Kommentar von %{user} %{time_ago}
       hidden_comment_by_html: Versteckter Kommentar von %{user} %{time_ago}
+      hide_comment: verstecken
+      unhide_comment: einblenden
+      comment: Kommentieren
       changesetxml: Änderungssatz-XML
       osmchangexml: osmChange-XML
     paging_nav:
@@ -678,6 +683,8 @@ de:
       title: Blog von %{user} | %{title}
       user_title: Blog von %{user}
       discussion: Diskussion
+      subscribe: Abonnieren
+      unsubscribe: Abbestellen
       leave_a_comment: Schreibe einen Kommentar
       login_to_leave_a_comment_html: '%{login_link}, um einen Kommentar zu schreiben'
       login: Anmelden
@@ -2338,9 +2345,6 @@ de:
     index:
       js_1: Dein Browser unterstützt kein JavaScript oder du hast es deaktiviert.
       js_2: OpenStreetMap nutzt JavaScript für die Kartendarstellung.
-      permalink: Permanentlink
-      shortlink: Shortlink
-      createnote: Hinweis geben/Fehler melden
       license:
         copyright: Copyright OpenStreetMap und Mitwirkende, unter einer offenen Lizenz
       remote_failed: Der Aufruf des Editors ist fehlgeschlagen. Stelle sicher, dass
@@ -3040,6 +3044,8 @@ de:
       remove as friend: Freund entfernen
       add as friend: Freund hinzufügen
       mapper since: 'Mapper seit:'
+      last map edit: 'Letzte Kartenbearbeitung:'
+      no activity yet: Noch keine Aktivität
       uid: 'Benutzer-ID:'
       ct status: 'Bedingungen für Mitwirkende:'
       ct undecided: Unentschlossen
@@ -3414,13 +3420,6 @@ de:
       queryfeature_tooltip: Objektabfrage
       queryfeature_disabled_tooltip: Für Objektabfrage vergrößern
       embed_html_disabled: Für diese Kartenebene ist keine HTML-Einbettung verfügbar
-    changesets:
-      show:
-        comment: Kommentieren
-        subscribe: Abonnieren
-        unsubscribe: Abbestellen
-        hide_comment: verstecken
-        unhide_comment: einblenden
     edit_help: Wähle eine höhere Zoomstufe und verschiebe die Karte an einen Ort,
       den du bearbeiten möchtest, und klicke hier.
     directions:

config/locales/diq.yml

@@ -313,6 +313,11 @@ diq:
       closed_ago_by_html: Be hetên %{user} ra %{time_ago} kefılia
       discussion: Werênayış
       join_discussion: Dekewtena vatenayışi rê qeyd bê
+      subscribe: Abone be
+      unsubscribe: Aboneyiye ra veciye
+      hide_comment: bınımne
+      unhide_comment: menımne
+      comment: Mışewre
       changesetxml: Vurnayışê peyênê XML
       osmchangexml: OsmVurnayışê XML
     paging_nav:
@@ -921,8 +926,6 @@ diq:
     copyright:
       native:
         title: Heqa na pele de
-    index:
-      permalink: Gıreyo daimi
     edit:
       user_page_link: pela karberi
     export:
@@ -1162,13 +1165,6 @@ diq:
         transport_map: Xeritay Resnayışi
     site:
       edit_tooltip: Xeriti timar ke
-    changesets:
-      show:
-        comment: Mışewre
-        subscribe: Abone be
-        unsubscribe: Aboneyiye ra veciye
-        hide_comment: bınımne
-        unhide_comment: menımne
     directions:
       engines:
         fossgis_osrm_bike: Bisiklet (OSRM)

config/locales/dsb.yml

@@ -297,6 +297,7 @@ dsb:
         belongs_to: Awtor
     show:
       title: 'Sajźba změnow: %{id}'
+      comment: Reagěrowaś
       changesetxml: Sajźbu změnow XML
       osmchangexml: osmChange XML
     paging_nav:
@@ -1181,9 +1182,6 @@ dsb:
       js_1: Pak wužywaš wobglědowak, kótaryž njepódpěra JavaScript, pak sy znjemóžnił
         JavaScript.
       js_2: OpenStreetMap wužywa JavaScript za suwatu kórtu.
-      permalink: Trajny wótkaz
-      shortlink: Krotki wótkaz
-      createnote: Pokaz pśidaś
       license:
         copyright: Copyright OpenStreetMap a sobustatkujuce, pód wótewrjoneju licencu
       remote_failed: Wobźěłowanje njejo se raźiło - pśeznań se, lěc JOSM jo zacytany
@@ -1764,9 +1762,6 @@ dsb:
       createnote_disabled_tooltip: Powětšyś, aby kórśe pokazku pśidało
       map_notes_zoom_in_tooltip: Powětš kórtu,  aby pokazki wiźeł
       map_data_zoom_in_tooltip: Powětš kórtu, aby daty wiźeł
-    changesets:
-      show:
-        comment: Reagěrowaś
     edit_help: Pśesuń kórtu do městna, kótarež coš wobźěłaś, powětš tam a klikni pótom
       how.
     directions:

config/locales/el.yml

@@ -527,8 +527,13 @@ el:
       join_discussion: Συνδεθείτε για συμμετοχή στη συζήτηση
       still_open: Η ομάδα αλλαγών παραμένει σε εκκρεμότητα - η συζήτηση θα ανοίξει
         μόλις ολοκληρωθεί η ομάδα αλλαγών.
+      subscribe: Εγγραφείτε ως συνδρομητής
+      unsubscribe: Κατάργηση εγγραφής
       comment_by_html: Σχόλιο από %{user} %{time_ago}
       hidden_comment_by_html: Κρυφό σχόλιο από %{user} %{time_ago}
+      hide_comment: απόκρυψη
+      unhide_comment: επανεμφάνιση
+      comment: Σχολιάζω
       changesetxml: Ομάδας αλλαγών XML
       osmchangexml: osmChange XML
     paging_nav:
@@ -2216,9 +2221,6 @@ el:
       js_1: Είτε χρησιμοποιείτε πρόγραμμα περιήγησης που δεν υποστηρίζει JavaScript
         ή έχετε απενεργοποιήσει την JavaScript.
       js_2: Το OpenStreetMap χρησιμοποιεί JavaScript για το ολισθαίνοντα χάρτη του.
-      permalink: Μόνιμος σύνδεσμος
-      shortlink: Σύντομος σύνδεσμος
-      createnote: Προσθήκη σημείωσης
       license:
         copyright: Πνευματικά δικαιώματα του OpenStreetMap και των συντακτών του,
           υπό ελεύθερη άδεια
@@ -3254,13 +3256,6 @@ el:
         για διάφορα χαρακτηριστικά
       embed_html_disabled: Η ενσωμάτωση HTML δεν είναι διαθέσιμη γι' αυτό το στρώμα
         χάρτη
-    changesets:
-      show:
-        comment: Σχολιάζω
-        subscribe: Εγγραφείτε ως συνδρομητής
-        unsubscribe: Κατάργηση εγγραφής
-        hide_comment: απόκρυψη
-        unhide_comment: επανεμφάνιση
     edit_help: Μετακινήστε το χάρτη και να κάνετε ζουμ σε μια τοποθεσία που θέλετε
       να επεξεργαστείτε, στη συνέχεια, κάντε κλικ εδώ.
     directions:

config/locales/en-GB.yml

@@ -394,6 +394,11 @@ en-GB:
       join_discussion: Log in to join the discussion
       still_open: Changeset still open - discussion will open once the changeset is
         closed.
+      subscribe: Subscribe
+      unsubscribe: Unsubscribe
+      hide_comment: hide
+      unhide_comment: unhide
+      comment: Comment
       changesetxml: Changeset XML
       osmchangexml: osmChange XML
     paging_nav:
@@ -1428,9 +1433,6 @@ en-GB:
     index:
       js_1: You are either using a browser that does not support JavaScript, or you
         have disabled JavaScript.
-      permalink: Permalink
-      shortlink: Shortlink
-      createnote: Add a note
       license:
         copyright: Copyright OpenStreetMap and contributors, under an open licence
       remote_failed: Editing failed - make sure JOSM or Merkaartor is loaded and that
@@ -2086,13 +2088,6 @@ en-GB:
       map_data_zoom_in_tooltip: Zoom in to see map data
       queryfeature_tooltip: Query features
       queryfeature_disabled_tooltip: Zoom in to query features
-    changesets:
-      show:
-        comment: Comment
-        subscribe: Subscribe
-        unsubscribe: Unsubscribe
-        hide_comment: hide
-        unhide_comment: unhide
     edit_help: Move the map and zoom in on a location you want to edit, then click
       here.
     directions:

config/locales/eo.yml

@@ -507,8 +507,13 @@ eo:
       join_discussion: Ensalutu por aliĝi al la diskuto
       still_open: Ŝanĝaro plue malfermita - diskuto estos malfermita ekde kiam la
         ŝanĝaro estos fermita.
+      subscribe: Observi
+      unsubscribe: Malobservi
       comment_by_html: Komento de %{time_ago} de %{user}
       hidden_comment_by_html: Kaŝita komento de %{time_ago} de %{user}
+      hide_comment: kaŝi
+      unhide_comment: malkaŝi
+      comment: Komenti
       changesetxml: Ŝanĝaro XML
       osmchangexml: osmŜanĝo XML
     paging_nav:
@@ -580,6 +585,8 @@ eo:
       title: Taglibro de %{user} | %{title}
       user_title: Taglibro de %{user}
       discussion: Diskuto
+      subscribe: Observi
+      unsubscribe: Malobservi
       leave_a_comment: Komenti
       login_to_leave_a_comment_html: '%{login_link} por aldoni komenton'
       login: Ensaluti
@@ -2179,9 +2186,6 @@ eo:
     index:
       js_1: Vi aŭ uzas foliumilon, kiu ne subtenas Ĝavoskripton, aŭ vi havas ĝin malaktivan.
       js_2: OpensStreetMap uzas Ĝavoskripton por montri ŝoveblan mapon.
-      permalink: Konstanta ligilo
-      shortlink: Mallonga ligilo
-      createnote: Aldoni rimarkon
       license:
         copyright: Aŭtorrajtoj al OpenStreetMap kaj kontribuintoj, laŭ malferma permesilo
       remote_failed: Redaktado malsukcesis - certigu ĉu JOSM aŭ Merkaartor estas startigita
@@ -2853,6 +2857,8 @@ eo:
       remove as friend: Eksamikigi
       add as friend: Aldoni kiel amikon
       mapper since: 'Mapigisto ekde:'
+      last map edit: 'Antaŭa map-redakto:'
+      no activity yet: ankoraŭ neniu agado
       uid: 'Identigilo de uzanto:'
       ct status: 'Interkonsento pri kontribuado:'
       ct undecided: ne decidita
@@ -3207,13 +3213,6 @@ eo:
       queryfeature_tooltip: Montri informojn pri objekto
       queryfeature_disabled_tooltip: Pligrandigu por montri informojn pri objektoj
       embed_html_disabled: HTML-enigo ne haveblas por ĉi tiu mapo-tavolo
-    changesets:
-      show:
-        comment: Komenti
-        subscribe: Observi
-        unsubscribe: Malobservi
-        hide_comment: kaŝi
-        unhide_comment: malkaŝi
     edit_help: Movu la mapon kaj pligrandigu al loko kiun vi volas redakti, kaj poste
       alklaku tie ĉi.
     directions:

config/locales/es.yml

@@ -23,6 +23,7 @@
 # Author: DannyS712
 # Author: DarkGames26
 # Author: Dcapillae
+# Author: Descubriunaisla
 # Author: Destinid10 2
 # Author: Dgstranz
 # Author: Egofer
@@ -587,8 +588,13 @@ es:
       join_discussion: Inicia sesión para unirte a la discusión
       still_open: El conjunto de cambios sigue abierto - la discusión se abrirá una
         vez se cierre el conjunto de cambios.
+      subscribe: Suscribirse
+      unsubscribe: Desuscribirse
       comment_by_html: Comentario de %{user} %{time_ago}
       hidden_comment_by_html: Comentario ocultado por %{user} %{time_ago}
+      hide_comment: ocultar
+      unhide_comment: mostrar
+      comment: Comentar
       changesetxml: XML del conjunto de cambios
       osmchangexml: XML en formato osmChange
     paging_nav:
@@ -663,6 +669,8 @@ es:
       title: Diario de %{user} | %{title}
       user_title: Diario de %{user}
       discussion: Discusión
+      subscribe: Suscribirse
+      unsubscribe: Desuscríbete
       leave_a_comment: Dejar un comentario
       login_to_leave_a_comment_html: '%{login_link} para dejar un comentario'
       login: Iniciar sesión
@@ -764,6 +772,10 @@ es:
       contact_the_community_html: Siéntete libre de %{contact_link} con la comunidad
         de OpenStreetMap si has encontrado un enlace roto o un error. Toma nota de
         la URL exacta de tu solicitud.
+    bad_request:
+      title: Mala solicitud
+      description: La operación que solicitaste en el servidor de OpenStreetMap no
+        es valida (HTTP 400)
     forbidden:
       title: Prohibido
       description: La operación que se solicitó al servidor de OpenStreetMap solo
@@ -1835,7 +1847,7 @@ es:
           La nota está cerca de %{place}.'
         commented_note_html: '%{commenter} ha reactivado un nota del mapa en la que
           has comentado. La nota está cerca de %{place}.'
-      details: Más detalles acerca de la nota pueden encontrarse en %{url}.
+      details: Responde o conoce más acerca de la nota en %{url}.
       details_html: Puedes encontrar más detalles acerca de la nota en %{url}.
     changeset_comment_notification:
       description: 'Conjunto de cambios de OpenStreetMap #%{id}'
@@ -1857,9 +1869,8 @@ es:
         partial_changeset_with_comment: con el comentario '%{changeset_comment}'
         partial_changeset_with_comment_html: con el comentario '%{changeset_comment}'
         partial_changeset_without_comment: sin comentarios
-      details: Puedes encontrar más detalles sobre el conjunto de cambios en %{url}.
+      details: Responde o conoce más sobre el conjunto de cambios en %{url}.
-      details_html: Puedes encontrar más detalles sobre el conjunto de cambios en
+      details_html: Responde o conoce más sobre el conjunto de cambios en %{url}.
-        %{url}.
       unsubscribe: Puedes desinscrirte de las actualizaciones de este conjunto de
         cambios en %{url}.
       unsubscribe_html: Puedes desinscrirte de las actualizaciones de este conjunto
@@ -2302,9 +2313,6 @@ es:
     index:
       js_1: Estás usando un navegador que no soporta o tiene desactivado JavaScript
       js_2: OpenStreetMap utiliza JavaScript para mostrar su mapa deslizable.
-      permalink: Enlace permanente
-      shortlink: Enlace corto
-      createnote: Añadir una nota
       license:
         copyright: Derechos de autor de OpenStreetMap y colaboradores, bajo una licencia
           abierta
@@ -2713,6 +2721,8 @@ es:
         other: Archivo GPX con %{count} puntos de %{user}
       description_without_count: Archivo GPX de %{user}
   application:
+    basic_auth_disabled: 'La autenticación básica de HTTPS está desactivada: %{link}'
+    oauth_10a_disabled: 'OAuth 1.0 y 1.0a están desactivados: %{link}'
     permission_denied: No tienes permisos para realizar esa acción
     require_cookies:
       cookies_needed: Parece que tienes las cookies deshabilitadas. Habilita las cookies
@@ -2997,6 +3007,8 @@ es:
       remove as friend: Eliminar como amigo
       add as friend: Añadir como amigo
       mapper since: 'Mapeando desde:'
+      last map edit: Última edición del mapa
+      no activity yet: Sin actividad todavía
       uid: 'Identificación de usuario:'
       ct status: 'Términos de Colaborador:'
       ct undecided: Indeciso
@@ -3282,6 +3294,10 @@ es:
       intro: ¿Detectaste un error o falta algo? Informa a otros mapeadores para que
         podamos corregirlo. Mueve el marcador a la posición correcta y escribe una
         nota para explicar el problema.
+      anonymous_warning_html: No has iniciado sesión. Por favor %{log_in} o %{sign_up}
+        si tu quieres recibir actualizaciones de tu nota.
+      anonymous_warning_log_in: inicia sesión
+      anonymous_warning_sign_up: crea una cuenta
       advice: Tu nota será pública y podría utilizarse para actualizar el mapa, así
         que no des información personal ni datos provenientes de mapas o catálogos
         protegidos por derechos de autor.
@@ -3361,13 +3377,6 @@ es:
       queryfeature_disabled_tooltip: Acercar para consultar elementos
       embed_html_disabled: La incrustación de HTML no está disponible para esta capa
         de mapa
-    changesets:
-      show:
-        comment: Comentar
-        subscribe: Suscribirse
-        unsubscribe: Cancelar suscripción
-        hide_comment: ocultar
-        unhide_comment: mostrar
     edit_help: Mueve el mapa el mapa y acerca a una ubicación que desees editar, luego
       haz clic aquí.
     directions:

config/locales/et.yml

@@ -484,8 +484,13 @@ et:
       join_discussion: Logi sisse, kui soovid arutelus osaleda
       still_open: Muudatuskogum on veel avatud. Arutelu avaneb siis, kui muudatuskogum
         on suletud.
+      subscribe: Telli
+      unsubscribe: Lõpeta tellimus
       comment_by_html: Kommentaar kasutajalt %{user} %{time_ago}
       hidden_comment_by_html: Peidetud kommentaar kasutajalt %{user} %{time_ago}
+      hide_comment: peida
+      unhide_comment: nähtavale
+      comment: Kommenteeri
       changesetxml: Muudatuskogumi XML
       osmchangexml: osmChange XML
     paging_nav:
@@ -2114,9 +2119,6 @@ et:
       js_1: Kasutad kas brauserit, mis ei toeta JavaScripti, või oled JavaScripti
         keelanud.
       js_2: OpenStreetMap kasutab JavaScripti kaartide laadimiseks.
-      permalink: Püsilink
-      shortlink: Lühilink
-      createnote: Lisa märkus
       license:
         copyright: Autoriõigused OpenStreetMap ja kaasautorid avatud litsentsi alusel
       remote_failed: Redigeerimise ebaõnnestus - veendu, et  JOSM või Merkaartor töötab
@@ -3083,13 +3085,6 @@ et:
       queryfeature_tooltip: Mis siin on?
       queryfeature_disabled_tooltip: Suurenda, et objektide kohta päring teha
       embed_html_disabled: Selle kaardikihi jaoks pole HTML-i lõimimine saadaval
-    changesets:
-      show:
-        comment: Kommenteeri
-        subscribe: Telli
-        unsubscribe: Lõpeta tellimus
-        hide_comment: peida
-        unhide_comment: nähtavale
     edit_help: Nihuta kaarti ja suumi sisse asukohta mida soovid redigeerida ja seejärel
       kliki siia.
     directions:

config/locales/eu.yml

@@ -487,8 +487,13 @@ eu:
       join_discussion: Hasi saioa eztabaidan parte hartzeko
       still_open: Aldaketak oraindik zabalik - eztabaida aldaketak itxi ondoren irekiko
         da.
+      subscribe: Harpidetu
+      unsubscribe: Harpidetza kendu
       comment_by_html: '%{user} -ren iruzkina orain dela %{time_ago}'
       hidden_comment_by_html: '%{user} -ren ezkutuko iruzkina %{time_ago} tik'
+      hide_comment: ezkutatu
+      unhide_comment: erakutsi
+      comment: Iruzkina
       changesetxml: Aldaketaren XML kodea
       osmchangexml: osmChange XML kodea
     paging_nav:
@@ -2080,9 +2085,6 @@ eu:
       js_1: Javascript onartzen ez duen arakatzailea erabiltzen ari zara edo JavaScript
         desgaitu duzu.
       js_2: OpenStreetMap-ek Javascript erabiltzen du bere mapa irriztagarrirako.
-      permalink: Esteka iraunkorra
-      shortlink: Esteka laburra
-      createnote: Gehitu oharra
       license:
         copyright: OpenStreetMap eta laguntzaileen Copyright-a erabili, lizentzia
           irekiaren babespean
@@ -2982,13 +2984,6 @@ eu:
       map_data_zoom_in_tooltip: Handiagotu mapa datuak ikusteko
       queryfeature_tooltip: Eskaera ezaugarriak
       queryfeature_disabled_tooltip: Handiagotu ezaugarriak eskatzeko
-    changesets:
-      show:
-        comment: Iruzkina
-        subscribe: Harpidetu
-        unsubscribe: Harpidetza kendu
-        hide_comment: ezkutatu
-        unhide_comment: erakutsi
     edit_help: Mugitu mapa eta zooma editatu nahi duzun kokaleku batean erabili, gero
       klik hemen egin.
     directions:

config/locales/fa.yml

@@ -490,8 +490,13 @@ fa:
       discussion: بحث
       join_discussion: وارد شوید تا به بحث بپیوندید
       still_open: بستهٔ تغییر هنوز باز است - امکان بحث پس از بستن آن باز می‌شود.
+      subscribe: اشتراک
+      unsubscribe: لغو اشتراک
       comment_by_html: نظر از %{user}‏ %{time_ago}
       hidden_comment_by_html: نظر پنهان؛ نوشتهٔ %{user}‏ %{time_ago}
+      hide_comment: نهفتن
+      unhide_comment: نمایش
+      comment: نظر
       changesetxml: Changeset XML
       osmchangexml: osmChange XML
     paging_nav:
@@ -1931,9 +1936,6 @@ fa:
       js_1: شما در حال استفاده از مرورگری هستید که جاوااسکریپت را پشتیبانی نمی‌کند،
         یا جاوااسکریپت را غیرفعال کرده‌اید.
       js_2: OpenStreetMap برای نقشهٔ لغزان از جاوااسکریپت استفاده می‌کند.
-      permalink: پیوند پایدار
-      shortlink: پیوند کوتاه
-      createnote: افزودن یادداشت
       license:
         copyright: حق نشر OpenStreetMap و مشارکت‌کنندگان، تحت یک پروانهٔ آزاد
       remote_failed: ویرایش انجام نشد - مطمئن شوید JOSM یا Merkaartor باز و گزینهٔ
@@ -2724,13 +2726,6 @@ fa:
       map_data_zoom_in_tooltip: برای دیدن دادهٔ نقشه بزرگ‌نمایی کنید
       queryfeature_tooltip: پرس‌وجوی عارضه‌ها
       queryfeature_disabled_tooltip: برای پرس‌وجوی عارضه‌ها بزرگ‌نمایی کنید
-    changesets:
-      show:
-        comment: نظر
-        subscribe: اشتراک
-        unsubscribe: لغو اشتراک
-        hide_comment: نهفتن
-        unhide_comment: نمایش
     edit_help: نقشه را جابه‌جا کنید و روی مکانی که می‌خواهید ویرایش نمایید بزرگ‌نمایی
       کنید. سپس اینجا کلیک کنید.
     directions:

config/locales/fi.yml

@@ -492,8 +492,13 @@ fi:
       join_discussion: Kirjaudu sisään osallistuaksesi keskusteluun
       still_open: Muutoskokoelma on edelleen avoimena - keskustelu avataan heti kun
         muutoskokoelma on suljettu.
+      subscribe: Tilaa
+      unsubscribe: Lopeta tilaus
       comment_by_html: Kommentti käyttäjältä %{user}, %{time_ago}
       hidden_comment_by_html: Piilotettu kommentti käyttäjältä %{user} %{time_ago}
+      hide_comment: piilota
+      unhide_comment: näytä
+      comment: Kommentoi
       changesetxml: Muutoskokoelman XML
       osmchangexml: osmChange XML
     paging_nav:
@@ -2029,9 +2034,6 @@ fi:
     index:
       js_1: Selain ei tue JavaScriptiä tai sen suorittaminen on estetty.
       js_2: OpenStreetMap tarvitsee JavaScriptin liikuteltavaan karttaan.
-      permalink: Ikilinkki
-      shortlink: Lyhytosoite
-      createnote: Ilmoita karttavirheestä
       license:
         copyright: 'Tekijänoikeus: OpenStreetMapin tekijät, avoimella lisenssillä'
       remote_failed: Muokkaus epäonnistui - varmista, että JOSM tai Merkaartor on
@@ -2936,13 +2938,6 @@ fi:
       map_data_zoom_in_tooltip: Näytä kartta-aineisto lähentämällä karttaa
       queryfeature_tooltip: Karttakohdeluettelo
       queryfeature_disabled_tooltip: Näytä ominaisuusluettelo suurentamalla karttaa
-    changesets:
-      show:
-        comment: Kommentoi
-        subscribe: Tilaa
-        unsubscribe: Lopeta tilaus
-        hide_comment: piilota
-        unhide_comment: näytä
     edit_help: Siirrä ja lähennä kartta muokattavaan paikkaan ja napsauta sitten tästä.
     directions:
       ascend: Nousu

config/locales/fit.yml

@@ -315,6 +315,7 @@ fit:
       join_discussion: Lokkaa sisäle, jos halvaat osallistua keskusteluun
       still_open: Muutoskokoelma on edelleen avoimena - keskustelu avathaan heti kun
         muutoskokoelma on suljettu.
+      comment: Kommentoi
       changesetxml: Muutoskokoelman XML
       osmchangexml: osmChange XML
     paging_nav:
@@ -759,9 +760,6 @@ fit:
           title: Nimeämisesimerkki
         more_title_html: Lisätietoja
         contributors_title_html: Meän tekijät
-    index:
-      permalink: Ikunen länkki
-      shortlink: Lyhylänkki
     edit:
       user_page_link: käyttäjätieot
     export:
@@ -913,9 +911,6 @@ fit:
     site:
       edit_tooltip: Mookkaa karttaa
       edit_disabled_tooltip: Lähennä karttaa mookataksesi
-    changesets:
-      show:
-        comment: Kommentoi
     directions:
       instructions:
         unnamed: nimetön tie

config/locales/fr.yml

@@ -247,7 +247,7 @@ fr:
         auth_provider: Fournisseur d’authentification
         auth_uid: UID d’authentification
         email: Courriel
-        new_email: Nouvelle adresse email
+        new_email: Nouvelle adresse de courriel
         active: Actif
         display_name: Afficher le nom
         description: Description du profil
@@ -612,8 +612,13 @@ fr:
       join_discussion: Se connecter pour rejoindre la discussion
       still_open: Ensemble de modifications toujours ouvert – la discussion s’ouvrira
         une fois que l’ensemble de modifications sera fermé.
+      subscribe: S’abonner
+      unsubscribe: Se désabonner
       comment_by_html: Commentaire de %{user} %{time_ago}
       hidden_comment_by_html: Commentaire caché de %{user} %{time_ago}
+      hide_comment: masquer
+      unhide_comment: démasquer
+      comment: Commenter
       changesetxml: XML du groupe de modifications
       osmchangexml: XML osmChange
     paging_nav:
@@ -689,6 +694,8 @@ fr:
       title: Carnet de %{user} | %{title}
       user_title: Carnet de %{user}
       discussion: Discussion
+      subscribe: S’abonner
+      unsubscribe: Se désabonner
       leave_a_comment: Laisser un commentaire
       login_to_leave_a_comment_html: '%{login_link} pour laisser un commentaire'
       login: Se connecter
@@ -2354,9 +2361,6 @@ fr:
       js_1: JavaScript n’est pas pris en charge par le navigateur que vous utilisez,
         ou bien vous l’avez désactivé.
       js_2: OpenStreetMap utilise Javascript pour ses cartes glissantes.
-      permalink: Lien permanent
-      shortlink: Lien court
-      createnote: Ajouter une note
       license:
         copyright: Copyright OpenStreetMap et ses contributeurs, sous une licence
           ouverte
@@ -3069,6 +3073,8 @@ fr:
       remove as friend: Supprimer en tant qu’ami
       add as friend: Ajouter en tant qu’ami
       mapper since: 'Cartographe depuis :'
+      last map edit: 'Dernière modification de la carte :'
+      no activity yet: Pas encore d'activité
       uid: 'Identifiant utilisateur :'
       ct status: 'Conditions de contribution :'
       ct undecided: Indécis
@@ -3436,13 +3442,6 @@ fr:
       queryfeature_disabled_tooltip: Zoomer plus pour rechercher des objets
       embed_html_disabled: L’intégration de HTML n’est pas disponible pour cette couche
         de carte
-    changesets:
-      show:
-        comment: Commenter
-        subscribe: S’abonner
-        unsubscribe: Se désabonner
-        hide_comment: masquer
-        unhide_comment: démasquer
     edit_help: Déplacez la carte et zoomez sur un emplacement que vous voulez modifier,
       puis cliquez dessus.
     directions:

config/locales/fur.yml

@@ -390,8 +390,13 @@ fur:
       closed_ago_by_html: Sierât di %{user} %{time_ago}
       discussion: Discussion
       join_discussion: Jentre par partecipâ ae discussion
+      subscribe: Notiti
+      unsubscribe: Disnotiti
       comment_by_html: Comentât di %{user} %{time_ago}
       hidden_comment_by_html: Coment platât di %{user} %{time_ago}
+      hide_comment: plate
+      unhide_comment: mostre
+      comment: Coment
       changesetxml: Grup di cambiaments XML
       osmchangexml: XML in formât osmChange
     paging_nav:
@@ -1204,9 +1209,6 @@ fur:
       js_1: Tu stâs doprant un sgarfadôr che nol supuarte JavaScript o ben JavaScript
         al è stât disativât.
       js_2: OpenStreetMap al dopre JavaScript par mostrâ la sô mape.
-      permalink: Leam permanent
-      shortlink: Leam curt
-      createnote: Zonte une note
       license:
         copyright: Copyright di OpenStreetMap e dai siei colaboradôrs, sot di une
           licence vierte
@@ -1799,13 +1801,6 @@ fur:
       map_data_zoom_in_tooltip: Aumente il zoom par viodi i dâts de mape
       queryfeature_tooltip: Domande ce ch'al è intun lûc
       queryfeature_disabled_tooltip: Aumente il zoom par domandâ ce ch'al è
-    changesets:
-      show:
-        comment: Coment
-        subscribe: Notiti
-        unsubscribe: Disnotiti
-        hide_comment: plate
-        unhide_comment: mostre
     edit_help: Môf la mape e aumente il zoom tal lûc che tu vuelis cambiâ, po frache
       culì
     directions:

config/locales/fy.yml

@@ -428,6 +428,11 @@ fy:
       join_discussion: Meld jo oan en oerlis mei
       still_open: Wizigingsset net ree - it oerlis iepenet sa gau't de wizigingsset
         ôfdien is.
+      subscribe: Folgje
+      unsubscribe: Net folgje
+      hide_comment: ferbergje
+      unhide_comment: werompleatse
+      comment: Reägearje
       changesetxml: Wizigingsset-XML
       osmchangexml: osmWizigings-XML
     paging_nav:
@@ -1855,9 +1860,6 @@ fy:
       js_1: Jo brûke ôf in webblêder dy't gjin JavaScript stipet, ôf jo hawwe JavaScript
         útskeakele.
       js_2: OpenStreetMap brûkt JavaScript foar de ferskobere kaart.
-      permalink: Fêste kepp.
-      shortlink: Lytse kepp.
-      createnote: Notysje taheakje
       license:
         copyright: Auteursrjochten OpenStreetMap en bydragers, ûnder in iepen lisinsje
       remote_failed: Bewurkjen mislearre - soargje dat JOSM of Merkaartor laden is,
@@ -2655,13 +2657,6 @@ fy:
       map_data_zoom_in_tooltip: Sûm yn om kaartdata sjen te kinnen
       queryfeature_tooltip: Skaaimerken opfreegje
       queryfeature_disabled_tooltip: Sûm yn om skaaimerken opfreegje te kinnen
-    changesets:
-      show:
-        comment: Reägearje
-        subscribe: Folgje
-        unsubscribe: Net folgje
-        hide_comment: ferbergje
-        unhide_comment: werompleatse
     edit_help: Sko de kaart en sûm yn op 'e lokaasje dy't jo bewurkje wolle, klik
       dan hjir.
     directions:

config/locales/ga.yml

@@ -318,6 +318,11 @@ ga:
       title: 'Tacar athruithe: %{id}'
       discussion: Plé
       join_discussion: Logáil isteach chun páirt a ghlacadh sa phlé
+      subscribe: Liostáil
+      unsubscribe: Díliostáil
+      hide_comment: folaigh
+      unhide_comment: dífholaigh
+      comment: Freagair
       changesetxml: XML an Tacair athruithe
       osmchangexml: XML osmChange
     paging_nav:
@@ -1373,9 +1378,6 @@ ga:
         díchumasaithe agat.
       js_2: Baineann OpenStreetMap úsáid as JavaScript dá léarscáil 'slippy' (léarscáil
         ghréasáin bunaithe ar thíleanna).
-      permalink: Buan-nasc
-      shortlink: Nasc gearr
-      createnote: Cuir nóta leis
       license:
         copyright: Cóipcheart OpenStreetMap agus rannchuiditheoirí, faoi cheadúnas
           oscailte
@@ -1888,13 +1890,6 @@ ga:
       map_data_zoom_in_tooltip: Zúmáil isteach chun sonraí na léarscáile a fheiceáil
       queryfeature_tooltip: Gnéithe a fhiosrú
       queryfeature_disabled_tooltip: Zúmáil isteach chun gnéithe a fhiosrú
-    changesets:
-      show:
-        comment: Freagair
-        subscribe: Liostáil
-        unsubscribe: Díliostáil
-        hide_comment: folaigh
-        unhide_comment: dífholaigh
     edit_help: Bog an léarscáil agus zúmáil isteach ar áit is mian leat a chur in
       eagar, ansin cliceáil anseo.
     directions:

config/locales/gcf.yml

@@ -160,6 +160,7 @@ gcf:
       join_discussion: Konèkté-w pou jwenn bokantaj-la
       comment_by_html: Komantasyon a %{user} %{time_ago}
       hidden_comment_by_html: Komantasyon ou dévwè a %{user} %{time_ago}
+      comment: Komantasyon
       changesetxml: Niméwo Chanjeman XML
       osmchangexml: osmChanjeman XML
   dashboards:
@@ -566,7 +567,6 @@ gcf:
       js_1: Ou ka sèvi èvè on navigatè ki pa ka sipòté Javascript ouben Javascript
         éten.
       js_2: OpenStreetMap ka sèvi èvè Javascript pou kat glisad.
-      permalink: Permalink
     edit:
       not_public: Ou pé pa réglé édision aw pou yo piblik.
       not_public_description_html: Pou modifié kat la fok édision aw piblik. Ou pé
@@ -696,9 +696,6 @@ gcf:
     site:
       edit_tooltip: Modifyé kat-la
       createnote_tooltip: Jouté on komantasyon asi kat-la
-    changesets:
-      show:
-        comment: Komantasyon
     directions:
       engines:
         fossgis_valhalla_bicycle: biskèt (Valhalla)

config/locales/gd.yml

@@ -296,6 +296,11 @@ gd:
       title: 'Seata atharraichean: %{id}'
       discussion: Deasbaireachd
       join_discussion: Clàraich a-steach gus pàirt a ghabhail san deasbaireachd
+      subscribe: Fo-sgrìobh
+      unsubscribe: Cuir crìoch air an fh-sgrìobhadh
+      hide_comment: falaich
+      unhide_comment: neo-fhalaich
+      comment: Thoir beachd
       changesetxml: XML le seata atharraichean
       osmchangexml: XML osmChange
     paging_nav:
@@ -1235,9 +1240,6 @@ gd:
       js_1: Tha thu a' chleachdadh brabhsair nach cuir taic ri JavaScript no chuir
         thu JavaScript à comas.
       js_2: Cleachdaidh OpenStreetMap JavaScript gus am mapa a shealltainn.
-      permalink: Ceangal buan
-      shortlink: Ceangal goirid
-      createnote: cuir nòta ris
       license:
         copyright: Còir-lethbhreac OpenStreetMap agus na co-thabhartaichean aige fo
           cheadachas fosgailte
@@ -1881,13 +1883,6 @@ gd:
       map_data_zoom_in_tooltip: Sùm a-steach gus dàta a' mhapa a shealltainn
       queryfeature_tooltip: Lorg airson feartan sònraichte
       queryfeature_disabled_tooltip: Sùm an-steach gus lorg airson feartan sònraichte
-    changesets:
-      show:
-        comment: Thoir beachd
-        subscribe: Fo-sgrìobh
-        unsubscribe: Cuir crìoch air an fh-sgrìobhadh
-        hide_comment: falaich
-        unhide_comment: neo-fhalaich
     edit_help: Gluais am mapa agus sùm a-steach air ionad a tha thu airson deasachadh.
       Briog an-seo an uairsin.
     directions:

config/locales/gl.yml

@@ -506,8 +506,13 @@ gl:
       join_discussion: Inicia a sesión para unirte á parola
       still_open: O conxunto de modificacións segue aberto. Abrirase a parola cando
         o conxunto de modificacións estea pechado.
+      subscribe: Subscribirse
+      unsubscribe: Cancelar a subscrición
       comment_by_html: Comentario de %{user} %{time_ago}
       hidden_comment_by_html: Comentario de %{user} agochado %{time_ago}
+      hide_comment: agochar
+      unhide_comment: amosar
+      comment: Comentar
       changesetxml: XML do conxunto de modificacións
       osmchangexml: XML de osmChange
     paging_nav:
@@ -584,6 +589,8 @@ gl:
       title: Diario de %{user} | %{title}
       user_title: Diario de %{user}
       discussion: Conversa
+      subscribe: Subscribirse
+      unsubscribe: Cancelar a subscrición
       leave_a_comment: Deixar un comentario
       login_to_leave_a_comment_html: '%{login_link} para deixar un comentario'
       login: Inicia sesión
@@ -1756,8 +1763,8 @@ gl:
           A nota está preto de %{place}.'
         commented_note_html: '%{commenter} reactivou unha das notas do mapa nas que
           comentaches. A nota está preto de %{place}.'
-      details: Pode atopar máis detalles da nota en %{url}.
+      details: Responde ou descubre máis detalles da nota en %{url}.
-      details_html: Podes atopar máis detalles da nota en %{url}.
+      details_html: Responde ou descubre máis detalles da nota en %{url}.
     changeset_comment_notification:
       description: Conxunto de modificacións do OpenStreetMap n.º %{id}
       hi: 'Ola, %{to_user}:'
@@ -1778,9 +1785,9 @@ gl:
         partial_changeset_with_comment: co comentario '%{changeset_comment}'
         partial_changeset_with_comment_html: con comentario '%{changeset_comment}'
         partial_changeset_without_comment: sen comentarios
-      details: Pódense atopar máis detalles acerca do conxunto de modificacións en
+      details: Responde ou descubre máis detalles do conxunto de modificacións en
         %{url}.
-      details_html: Pódense atopar máis detalles sobre o conxunto de modificacións
+      details_html: Responde ou descubre máis detalles do conxunto de modificacións
         en %{url}.
       unsubscribe: Podes cancelar a subscrición ás actualizacións deste conxunto de
         modificacións en %{url}.
@@ -2237,9 +2244,6 @@ gl:
     index:
       js_1: Estás a usar un navegador que non soporta o JavaScript ou telo desactivado.
       js_2: O OpenStreetMap emprega JavaScript para o seu mapa estático e dinámico.
-      permalink: Ligazón permanente
-      shortlink: Atallo
-      createnote: Engadir unha nota
       license:
         copyright: Dereitos de autoría do OpenStreetMap e os seus colaboradores, baixo
           unha licenza aberta
@@ -2920,6 +2924,8 @@ gl:
       remove as friend: Eliminar coma amizade
       add as friend: Engadir coma amizade
       mapper since: 'Cartógrafo dende:'
+      last map edit: 'Última edición do mapa:'
+      no activity yet: Aínda non hai actividade
       uid: 'Identificador de usuario:'
       ct status: 'Termos do colaborador:'
       ct undecided: Indeciso
@@ -3283,13 +3289,6 @@ gl:
       queryfeature_disabled_tooltip: Achegar para consultar os elementos
       embed_html_disabled: A incorporación de HTML non está dispoñible para esta capa
         de mapa
-    changesets:
-      show:
-        comment: Comentar
-        subscribe: Subscribirse
-        unsubscribe: Cancelar a subscrición
-        hide_comment: agochar
-        unhide_comment: amosar
     edit_help: Desplaza o mapa e achégao na localización que queiras editar; logo,
       preme aquí.
     directions:

config/locales/he.yml

@@ -545,8 +545,13 @@ he:
       discussion: דיון
       join_discussion: נא להיכנס לחשבון כדי להצטרף לדיון
       still_open: ערכת השינויים עדיין פתוחה – הדיון ייפתח אחרי שערכת השיניים תיסגר.
+      subscribe: מינוי
+      unsubscribe: ביטול מינוי
       comment_by_html: הערה מאת %{user} %{time_ago}
       hidden_comment_by_html: הערה מוסתרת מאת %{user} %{time_ago}
+      hide_comment: הסתרה
+      unhide_comment: ביטול הסתרה
+      comment: להגיב
       changesetxml: XML של ערכת השינויים
       osmchangexml: osmChange XML
     paging_nav:
@@ -618,6 +623,8 @@ he:
       title: היומן של%{user} ‏ | %{title}
       user_title: היומן של %{user}
       discussion: דיון
+      subscribe: מינוי
+      unsubscribe: ביטול מינוי
       leave_a_comment: הוספת תגובה
       login_to_leave_a_comment_html: נא %{login_link} כדי להשאיר תגובה
       login: להיכנס
@@ -2232,9 +2239,6 @@ he:
     index:
       js_1: הדפדפן שבו אתה משתמש אינו תומך ב־JavaScript, או שכיבית את השימוש ב־JavaScript.
       js_2: אתר OpenStreetMap משתמש ב־JavaScript למפה המחליקה.
-      permalink: קישור קבוע
-      shortlink: קישור מקוצר
-      createnote: הוספת הערה
       license:
         copyright: 'זכויות היוצרים: מיזם OpenStreetMap ותורמיו, בכפוף לרישיון פתוח'
       remote_failed: העריכה נכשלה – נא לוודא כי JOSM או Merkaartor נטענו ושאפשרות
@@ -2884,6 +2888,8 @@ he:
       remove as friend: הסרה מרשימת חברים
       add as friend: הוספה כחבר
       mapper since: 'ממפה מאז:'
+      last map edit: 'עריכת מפה אחרונה:'
+      no activity yet: עדיין אין פעילות
       uid: 'מזהה משתמש:'
       ct status: 'תנאי תרומה:'
       ct undecided: עוד אין החלטה
@@ -3252,13 +3258,6 @@ he:
       queryfeature_tooltip: שאילתת ישויות
       queryfeature_disabled_tooltip: התקרבות כדי להריץ שאילתת ישויות
       embed_html_disabled: הטבעת HTML אינה זמינה בשכבת המפה הזאת
-    changesets:
-      show:
-        comment: להגיב
-        subscribe: מינוי
-        unsubscribe: ביטול מינוי
-        hide_comment: הסתרה
-        unhide_comment: ביטול הסתרה
     edit_help: יש להזיז את המפה ולהתמקד על מיקום שברצונך לערוך ואז ללחוץ כאן.
     directions:
       ascend: מעלה

config/locales/hi.yml

@@ -409,6 +409,7 @@ hi:
       join_discussion: चर्चा में भाग लेने के लिए लॉग इन करें
       still_open: चेंजसेट अभी भी खुला - चेंजसेट के एक बार बंद होने के पश्चात चर्चा
         होगी।
+      comment: जवाब देना
       changesetxml: Changeset XML
       osmchangexml: osmChange XML
     paging_nav:
@@ -1078,9 +1079,6 @@ hi:
   javascripts:
     site:
       createnote_disabled_tooltip: नोट जोड़ने के लिए जूम इन करें
-    changesets:
-      show:
-        comment: जवाब देना
     directions:
       directions: रास्ता
       distance: दूरी

config/locales/hr.yml

@@ -393,6 +393,11 @@ hr:
       title: 'Set promjena: %{id}'
       discussion: Razgovor
       join_discussion: Prijavi se za uključivanje u raspravu
+      subscribe: Pretplati se
+      unsubscribe: Otkaži pretplatu
+      hide_comment: sakrij
+      unhide_comment: vrati sakriveno
+      comment: Komentiraj
       changesetxml: XLM Set promjena
       osmchangexml: osmChange XML
     paging_nav:
@@ -1307,9 +1312,6 @@ hr:
       js_1: Koristite preglednik koji ne podržava JavaScript ili Vam je JavaScript
         isključen.
       js_2: OpenStreetMap koristi JavaScript za slippy kartu.
-      permalink: Permalink
-      shortlink: Kratki link
-      createnote: Dodaj bilješku
       license:
         copyright: Autorska prava pripadaju OpenStreetMap-u i doprinositeljima, pod
           otvorenom licencijom
@@ -1902,13 +1904,6 @@ hr:
       map_data_zoom_in_tooltip: Približi da vidiš podatke karte
       queryfeature_tooltip: Provjeri elemente karte
       queryfeature_disabled_tooltip: Približi za provjeru elemenata
-    changesets:
-      show:
-        comment: Komentiraj
-        subscribe: Pretplati se
-        unsubscribe: Otkaži pretplatu
-        hide_comment: sakrij
-        unhide_comment: vrati sakriveno
     edit_help: Pomakni kartu i približi dio koji želiš urediti, zatim klikni ovdje.
     directions:
       engines:

config/locales/hsb.yml

@@ -464,8 +464,13 @@ hsb:
       join_discussion: Přizjew so, zo by móhł(a) sobu diskutować
       still_open: Sadźba změnow je hišće wočinjena. Diskusija so wočinja, ručež je
         sadźba změnow začinjena.
+      subscribe: Abonować
+      unsubscribe: Wotskazać
       comment_by_html: Komentar wot %{user} %{time_ago}
       hidden_comment_by_html: Schowany komentar wot %{user} %{time_ago}
+      hide_comment: schować
+      unhide_comment: pokazać
+      comment: Komentar
       changesetxml: Sadźba změnow XML
       osmchangexml: osmChange XML
     paging_nav:
@@ -1932,9 +1937,6 @@ hsb:
       js_1: Pak wužiwaš wobhladowak, kotryž JavaScript njepodpěruje, pak sy JavaScript
         znjemóžnił.
       js_2: OpenStreetMap JavaScript za slippy map wužiwa.
-      permalink: Trajny wotkaz
-      shortlink: Krótki wotkaz
-      createnote: Pokazku přidać
       license:
         copyright: Copyright OpenStreetMap a sobuskutkowarjo, pod wotewrjenej licencu
       remote_failed: Wobdźěłowanje je so njeporadźiło - zawěsć, zo JOSM abo Merkaartor
@@ -2801,13 +2803,6 @@ hsb:
       map_data_zoom_in_tooltip: Powjetš kartu, zo by daty widźał
       queryfeature_tooltip: Funkcije naprašować
       queryfeature_disabled_tooltip: Za naprašowanje funkcijow powjetšić
-    changesets:
-      show:
-        comment: Komentar
-        subscribe: Abonować
-        unsubscribe: Wotskazać
-        hide_comment: schować
-        unhide_comment: pokazać
     edit_help: Přesuń kartu do městna, kotrež chceš wobdźěłać, powjetš tam a klikń
       potom tu.
     directions:

config/locales/hu.yml

@@ -515,8 +515,13 @@ hu:
       join_discussion: Jelentkezz be, hogy bekapcsolódhass a megbeszélésbe
       still_open: A módosításcsomag még nyitva van – a megbeszélés akkor nyílik meg,
         ha a módosításcsomag lezárul.
+      subscribe: Feliratkozás
+      unsubscribe: Leiratkozás
       comment_by_html: Hozzászólt %{user} %{time_ago}
       hidden_comment_by_html: Rejtett hozzászólás %{user} felhasználótól %{time_ago}
+      hide_comment: elrejt
+      unhide_comment: megjelenít
+      comment: Hozzászólás
       changesetxml: Módosításcsomag adatai (XML)
       osmchangexml: Módosításcsomag tartalma (osmChange XML)
     paging_nav:
@@ -2153,9 +2158,6 @@ hu:
       js_1: Vagy egy olyan böngészőt használsz, amely nem támogatja a JavaScriptet,
         vagy letiltottad a JavaScriptet.
       js_2: Az OpenStreetMap JavaScriptet használ a slippy maphoz.
-      permalink: Permalink
-      shortlink: Shortlink
-      createnote: Új jegyzet
       license:
         copyright: Copyright OpenStreetMap és közreműködői, egy nyílt licenc alatt
       remote_failed: A szerkesztés nem sikerült. Győződj meg róla, hogy a JOSM vagy
@@ -3148,13 +3150,6 @@ hu:
       queryfeature_tooltip: Objektumok lekérdezése
       queryfeature_disabled_tooltip: Objektumok lekérdezéséhez nagyíts a térképre
       embed_html_disabled: Ezen a térképrétegen nem lehet HTML-t beágyazni
-    changesets:
-      show:
-        comment: Hozzászólás
-        subscribe: Feliratkozás
-        unsubscribe: Leiratkozás
-        hide_comment: elrejt
-        unhide_comment: megjelenít
     edit_help: Mozgasd a térképet, nagyíts ott ahol módosítani szeretnéd, majd kattints
       ide.
     directions:

config/locales/ia.yml

@@ -489,8 +489,13 @@ ia:
       join_discussion: Aperi session pro unir te al discussion
       still_open: Le gruppo de modificationes es ancora aperte. Le discussion se aperira
         quando le gruppo de modificationes essera claudite.
+      subscribe: Subscriber
+      unsubscribe: Cancellar subscription
       comment_by_html: Commento de %{user} %{time_ago}
       hidden_comment_by_html: Commento celate de %{user} %{time_ago}
+      hide_comment: celar
+      unhide_comment: revelar
+      comment: Commento
       changesetxml: XML del gruppo de modificationes
       osmchangexml: XML osmChange
     paging_nav:
@@ -566,6 +571,8 @@ ia:
       title: Diario de %{user} | %{title}
       user_title: Diario de %{user}
       discussion: Discussion
+      subscribe: Abonar me
+      unsubscribe: Disabonar me
       leave_a_comment: Lassar un commento
       login_to_leave_a_comment_html: '%{login_link} pro lassar un commento'
       login: Aperir session
@@ -1743,8 +1750,8 @@ ia:
           Le nota es in le vicinitate de %{place}.'
         commented_note_html: '%{commenter} ha reactivate un nota de carta que tu ha
           commentate. Le nota es in le vicinitate de %{place}.'
-      details: Plus detalios sur le nota pote esser trovate a %{url}.
+      details: Responde o discoperi plus sur le nota a %{url}.
-      details_html: Plus detalios sur le nota pote esser trovate a %{url}.
+      details_html: Responde o discoperi plus sur le nota a %{url}.
     changeset_comment_notification:
       description: 'Gruppo de modificationes OpenStreetMap #%{id}'
       hi: Salute %{to_user},
@@ -1765,10 +1772,8 @@ ia:
         partial_changeset_with_comment: con commento '%{changeset_comment}'
         partial_changeset_with_comment_html: con commento '%{changeset_comment}'
         partial_changeset_without_comment: sin commento
-      details: Plus detalios sur le gruppo de modificationes pote esser trovate a
+      details: Responde o discoperi plus sur le gruppo de modificationes a %{url}.
-        %{url}.
+      details_html: Responde o discoperi plus sur le gruppo de modificationes a %{url}.
-      details_html: Plus detalios sur le gruppo de modificationes pote esser trovate
-        a %{url}.
       unsubscribe: Tu pote disabonar te del actualisationes de iste gruppo de modificationes
         sur %{url}.
       unsubscribe_html: Tu pote disabonar te del actualisationes de iste gruppo de
@@ -2204,9 +2209,6 @@ ia:
       js_1: O tu usa un navigator que non supporta JavaScript, o tu ha disactivate
         JavaScript.
       js_2: OpenStreetMap usa JavaScript pro su carta glissante.
-      permalink: Permaligamine
-      shortlink: Ligamine curte
-      createnote: Adder un nota
       license:
         copyright: Copyright OpenStreetMap e contributores, sub licentia aperte
       remote_failed: Modification fallite - assecura te que JOSM o Merkaartor es cargate
@@ -2888,6 +2890,8 @@ ia:
       remove as friend: Remover amico
       add as friend: Adder amico
       mapper since: 'Cartographo depost:'
+      last map edit: 'Ultime modification del carta:'
+      no activity yet: Necun activitate ancora
       uid: 'ID de usator:'
       ct status: 'Conditiones de contributor:'
       ct undecided: Indecise
@@ -3249,13 +3253,6 @@ ia:
       queryfeature_disabled_tooltip: Face zoom avante pro cercar objectos
       embed_html_disabled: Le incastration de HTML non es disponibile pro iste strato
         cartographic
-    changesets:
-      show:
-        comment: Commento
-        subscribe: Subscriber
-        unsubscribe: Cancellar subscription
-        hide_comment: celar
-        unhide_comment: revelar
     edit_help: Displacia le carta e face zoom avante in un loco que tu vole modificar,
       postea clicca hic.
     directions:

config/locales/id.yml

@@ -484,8 +484,13 @@ id:
       join_discussion: Masuk untuk bergabung diskusi
       still_open: Set perubahan masih terbuka - diskusi akan dibuka ketika set perubahan
         telah ditutup.
+      subscribe: Berlangganan
+      unsubscribe: Berhenti berlangganan
       comment_by_html: Komentar dari %{user} %{time_ago}
       hidden_comment_by_html: Komentar tersembunyi dari %{user} %{time_ago}
+      hide_comment: sembunyikan
+      unhide_comment: Jangan sembunyikan
+      comment: Komentar
       changesetxml: Set Perubahan XML
       osmchangexml: osmChange XML
     paging_nav:
@@ -2158,9 +2163,6 @@ id:
       js_1: Anda menggunakan browser yang tidak mendukung JavaScript, atau Anda telah
         menonaktifkan JavaScript.
       js_2: OpenStreetMap menggunakan JavaScript untuk slippy map nya.
-      permalink: Permalink
-      shortlink: Shortlink
-      createnote: Tambahkan catatan
       license:
         copyright: Hak cipta dan kontributor OpenStreetMap, di bawah lisensi terbuka
       remote_failed: Gagal melakukan edit - pastikan JOSM atau Merkaartor telah termuat
@@ -3151,13 +3153,6 @@ id:
       queryfeature_tooltip: Fitur kueri
       queryfeature_disabled_tooltip: Perbesar ke fitur kueri
       embed_html_disabled: Penyematan HTML tidak tersedia untuk lapisan peta ini
-    changesets:
-      show:
-        comment: Komentar
-        subscribe: Berlangganan
-        unsubscribe: Berhenti berlangganan
-        hide_comment: sembunyikan
-        unhide_comment: Jangan sembunyikan
     edit_help: Memindahkan peta dan memperbesar lokasi yang ingin Anda sunting, kemudian
       klik di sini.
     directions:

config/locales/is.yml

@@ -471,8 +471,13 @@ is:
       join_discussion: Skráðu þig inn til að taka þátt í umræðunni
       still_open: Breytingasett er enn opið - Umræða mun opnast þegar breytingasettinu
         hefur verið lokað.
+      subscribe: Gerast áskrifandi
+      unsubscribe: Hætta í áskrift
       comment_by_html: Umsögn frá %{user} %{time_ago}
       hidden_comment_by_html: Falin umsögn frá %{user} %{time_ago}
+      hide_comment: fela
+      unhide_comment: hætta að fela
+      comment: Athugasemd
       changesetxml: XML breytingasetts
       osmchangexml: XML osmChange
     paging_nav:
@@ -2161,9 +2166,6 @@ is:
       js_1: Þú ert annaðhvort að nota vafra sem styður ekki JavaScript eða hefur slökkt
         á JavaScript stuðning.
       js_2: OpenStreetMap notar JavaScript til að útfæra gagnvirk kort.
-      permalink: Varanlegur tengill
-      shortlink: Varanlegur smátengill
-      createnote: Bæta við minnispunkti
       license:
         copyright: Höfundarréttur OpenStreetMap og þátttakendur, með opnu notkunarleyfi
       remote_failed: Breytingar mistókust - gakktu úr skugga um að JOSM eða Merkaartor
@@ -3143,13 +3145,6 @@ is:
       map_data_zoom_in_tooltip: Renndu að til að skoða gögn kortsins
       queryfeature_tooltip: Rannsaka fitjur
       queryfeature_disabled_tooltip: Renndu að til að rannsaka fitjur
-    changesets:
-      show:
-        comment: Athugasemd
-        subscribe: Gerast áskrifandi
-        unsubscribe: Hætta í áskrift
-        hide_comment: fela
-        unhide_comment: hætta að fela
     edit_help: Færðu kortið og stilltu aðdrátt inn á staðinn sem þú vilt breyta, smelltu
       síðan hér.
     directions:

config/locales/it.yml

@@ -550,8 +550,13 @@ it:
       join_discussion: Accedi per unirti alla discussione
       still_open: Il gruppo di modifiche è ancora aperto - le discussioni saranno
         disponibili quando verrà chiuso.
+      subscribe: Iscriviti
+      unsubscribe: Annulla iscrizione
       comment_by_html: Commento da %{user} %{time_ago}
       hidden_comment_by_html: Commento nascosto da %{user} %{time_ago}
+      hide_comment: nascondi
+      unhide_comment: Rendi visibile
+      comment: Commenta
       changesetxml: Gruppo di modifiche XML
       osmchangexml: XML in formato osmChange
     paging_nav:
@@ -2251,9 +2256,6 @@ it:
       js_1: Si sta utilizzando un browser che non supporta JavaScript, oppure è stato
         disabilitato JavaScript.
       js_2: OpenStreetMap utilizza JavaScript per le sua mappa.
-      permalink: Link permanente
-      shortlink: Link breve
-      createnote: Aggiungi una nota
       license:
         copyright: Copyright OpenStreetMap e collaboratori, sotto una licenza aperta
       remote_failed: Modifica non riuscita - assicurarsi che JOSM o Merkaartor sia
@@ -3292,13 +3294,6 @@ it:
       queryfeature_disabled_tooltip: Ingrandisci per ricercare elementi
       embed_html_disabled: L'incorporamento HTML non è disponibile per questo livello
         mappa
-    changesets:
-      show:
-        comment: Commenta
-        subscribe: Iscriviti
-        unsubscribe: Annulla iscrizione
-        hide_comment: nascondi
-        unhide_comment: Rendi visibile
     edit_help: Sposta la mappa e usa lo zoom sulla posizione che vuoi modificare,
       quindi clicca qui.
     directions:

config/locales/ja.yml

@@ -478,6 +478,11 @@ ja:
       discussion: 議論
       join_discussion: 議論に参加するにはログインしてください
       still_open: 変更セットが開いたままです - 議論を行うには変更セットを閉じる必要があります。
+      subscribe: 購読
+      unsubscribe: 購読停止
+      hide_comment: 非表示
+      unhide_comment: 非表示を解除
+      comment: コメント
       changesetxml: 変更セット XML
       osmchangexml: OSM 差分 XML
     paging_nav:
@@ -1881,9 +1886,6 @@ ja:
     index:
       js_1: JavaScript に対応していないブラウザーを使用しているか、JavaScript を無効にしているかのどちらかです。
       js_2: OpenStreetMap は地図の表示に JavaScript を使用します。
-      permalink: 固定リンク
-      shortlink: 短縮リンク
-      createnote: メモを追加
       license:
         copyright: オープンライセンスによるOpenStreetMapおよび協力者の著作権を保護する
       remote_failed: 編集に失敗しました - JOSM または Merkaartor を起動し、リモート制御オプションが有効になっていることを確認してください
@@ -2347,13 +2349,24 @@ ja:
       support: サポート
       about:
         header: フリー、編集可能
+        paragraph_1: 他の地図とは異なり、OpenStreetMapは完全に皆さんのような人によって作成されおり、誰でも自由に修正・更新・ダウンロード・利用ができます。
+        paragraph_2: 投稿を通じて貢献するには、登録が必要です。
+        welcome: OpenStreetMap へようこそ。
+      duplicate_social_email: すでに OpenStreetMap アカウントをお持ちで第三者認証プロバイダーを使用したい場合は、パスワードを使用してログインしたうえでアカウントの設定を変更してください。
       display name description: あなたの公開利用者名です。あとで個人設定で変更できます。
+      by_signing_up_html: 登録することで %{tou_link}、 %{privacy_policy_link}と %{contributor_terms_link}に同意したことになります。
+      tou: 利用規約
+      contributor_terms: 協力者規約
       external auth: 'サードパーティ認証:'
       continue: 利用者登録
       terms accepted: 新しい協力者規約を承諾していただき、ありがとうございます!
+      email_help_html: あなたのアドレスは公開されません。詳細については、%{privacy_policy_link} をご覧ください。
       privacy_policy: プライバシー・ポリシー
+      privacy_policy_title: OSMFのプライバシーポリシー（電子メールアドレスに関するセクションを含む）
+      consider_pd_html: 私の貢献は %{consider_pd_link} にあるとみなします。
       consider_pd: パブリックドメイン
-      use external auth: サードパーティのアカウントでもログインできます
+      or: または
+      use external auth: サードパーティのアカウントでもログインできます。
     terms:
       title: 規約
       heading: 規約
@@ -2365,6 +2378,7 @@ ja:
       read_tou: 私は利用規約を読み終え、これに同意します
       consider_pd: 上記に加え、私の投稿をパブリック ドメインとします
       consider_pd_why: これは何ですか?
+      guidance_info_html: 'これらの用語を理解するのに役立つ情報: %{readable_summary_link} といくつかの %{informal_translations_link}'
       readable_summary: 人間が読める要約
       informal_translations: 非公式の翻訳
       continue: 続行
@@ -2410,6 +2424,8 @@ ja:
       remove as friend: 友達を解除
       add as friend: 友達として追加
       mapper since: 'マッパー歴:'
+      last map edit: '地図の最後の編集:'
+      no activity yet: 活動がありません
       uid: '利用者id:'
       ct status: '協力者規約:'
       ct undecided: 未決定
@@ -2425,6 +2441,7 @@ ja:
         grant:
           administrator: 管理者権限を許可
           moderator: モデレーター権限を許可
+          importer: importerアクセス権を付与する
         revoke:
           administrator: 管理者権限を剥奪
           moderator: モデレーター権限を剥奪
@@ -2685,13 +2702,6 @@ ja:
       queryfeature_tooltip: 地物を検索
       queryfeature_disabled_tooltip: 検索した地物にズーム
       embed_html_disabled: このマップレイヤーではHTML埋め込みは利用できません
-    changesets:
-      show:
-        comment: コメント
-        subscribe: 購読
-        unsubscribe: 購読停止
-        hide_comment: 非表示
-        unhide_comment: 非表示を解除
     edit_help: 編集したい位置に移動してズームインしてから、ここをクリックしてください。
     directions:
       ascend: 上り坂

config/locales/ka.yml

@@ -891,10 +891,6 @@ ka:
         mapping_link: კარტოგრაფირების დაწყება
       legal_babble:
         title_html: საავტორო უფლებები და ლიცენზია
-    index:
-      permalink: მუდმივი ბმული
-      shortlink: მოკლე ბმული
-      createnote: შენიშვნის დამატება
     edit:
       user_page_link: მომხმარებლის გვერდი
     export:

config/locales/kab.yml

@@ -347,6 +347,11 @@ kab:
       join_discussion: Qqen akken ad tedduḍ ar usqerdec
       still_open: Tagrumma isenfilen zgan ldin - asqerdec ad yili mara isenfilen meṛṛa
         ttwamedlen.
+      subscribe: Jerred
+      unsubscribe: Ffeɣ seg ujerred
+      hide_comment: ffer
+      unhide_comment: sken
+      comment: Awennit
       changesetxml: XML n ugraw n ibeddilen
       osmchangexml: XML osmChange
     paging_nav:
@@ -998,10 +1003,6 @@ kab:
           title: Amedya n uttekki
         more_title_html: Akken ad tafeḍ ugar n telɣut
         contributors_title_html: Iwiziwen-nneɣ
-    index:
-      permalink: Aseɣwen yezgan
-      shortlink: Aseɣwen awezlan
-      createnote: Rnu tazmilt
     edit:
       user_page_link: asebter n useqdac
     export:
@@ -1374,13 +1375,6 @@ kab:
       edit_tooltip: Ẓreg takarḍa
       createnote_tooltip: Rnu tazmilt ar tkarḍa
       queryfeature_tooltip: isitar ɣef tmahilin
-    changesets:
-      show:
-        comment: Awennit
-        subscribe: Jerred
-        unsubscribe: Ffeɣ seg ujerred
-        hide_comment: ffer
-        unhide_comment: sken
     directions:
       engines:
         fossgis_osrm_car: S tkeṛṛust (OSRM)

config/locales/kk-cyrl.yml

@@ -340,6 +340,9 @@ kk-cyrl:
     show:
       title: 'Өңдеме дестесі: %{id}'
       discussion: Талқылау
+      subscribe: Жазылу
+      hide_comment: жасыру
+      unhide_comment: көрсету
       changesetxml: Өңдеме дестесінің XML-і
       osmchangexml: osmChange XML
     paging_nav:
@@ -1061,10 +1064,6 @@ kk-cyrl:
         contributors_es_spain: Испания
         contributors_za_south_africa: Оңтүстік Африка
         contributors_gb_united_kingdom: Ұлыбритания
-    index:
-      permalink: Тұрақты сілтеме
-      shortlink: Қысқа сілтеме
-      createnote: Ескертпе қосу
     edit:
       user_page_link: қолданушы беті
     export:
@@ -1310,11 +1309,6 @@ kk-cyrl:
       queryfeature_tooltip: Маңайдағы нысандар
       queryfeature_disabled_tooltip: Маңайдағы нысандарды көру үшін картаны үлкейтіп
         жіберіңіз
-    changesets:
-      show:
-        subscribe: Жазылу
-        hide_comment: жасыру
-        unhide_comment: көрсету
     directions:
       engines:
         fossgis_osrm_bike: Велосипед (OSRM)

config/locales/ko.yml

@@ -484,8 +484,13 @@ ko:
       discussion: 토론
       join_discussion: 토론에 참여하려면 로그인하세요
       still_open: 바뀜집합이 아직 열려 있습니다 - 토론은 바뀜집합이 닫히면 시작됩니다.
+      subscribe: 구독
+      unsubscribe: 구독 해지
       comment_by_html: '%{time_ago} %{user}님의 의견'
       hidden_comment_by_html: '%{time_ago} %{user}님의 비밀 의견'
+      hide_comment: 숨기기
+      unhide_comment: 숨기기 취소
+      comment: 의견
       changesetxml: 바뀜집합 XML
       osmchangexml: osmChange XML
     paging_nav:
@@ -2012,9 +2017,6 @@ ko:
     index:
       js_1: 자바스크립트를 지원하지 않는 브라우저를 사용 중이거나, 자바스크립트가 활성화되어 있지 않습니다.
       js_2: 오픈스트리트맵은 매끄러운 지도를 위해 자바스크립트를 사용합니다.
-      permalink: 고유링크
-      shortlink: 짧은링크
-      createnote: 참고 추가
       license:
         copyright: 저작권 오픈스트리트맵 및 기여자, 오픈 라이선스로 배포
       remote_failed: 편집을 실패했습니다 - JOSM이나 Merkaartor를 불러왔고 원격 제어 설정이 활성화되어 있는지 확인하세요
@@ -2932,13 +2934,6 @@ ko:
       queryfeature_tooltip: 지물 정보
       queryfeature_disabled_tooltip: 지물 정보를 확인하려면 확대
       embed_html_disabled: 이 지도 레이어에는 HTML 임베딩을 사용할 수 없습니다.
-    changesets:
-      show:
-        comment: 의견
-        subscribe: 구독
-        unsubscribe: 구독 해지
-        hide_comment: 숨기기
-        unhide_comment: 숨기기 취소
     edit_help: 편집하려는 위치에 지도를 이동하고 확대한 다음, 여기를 클릭하세요.
     directions:
       ascend: 올라가기

config/locales/ku-Latn.yml

@@ -449,8 +449,13 @@ ku-Latn:
       join_discussion: Ji bo ku beșdarî guftûgoyan bibî têkeve
       still_open: Qeyda guhartinan hê jî vekirî ye - wê gotûbêj piştî ku qeyda guhartinan
         hate girtin vebibe.
+      subscribe: Bibe abone
+      unsubscribe: Ji abonetiyê derkeve
       comment_by_html: Şîroveya ji %{user} %{time_ago}
       hidden_comment_by_html: Şîroveya veşartî ji %{user} %{time_ago}
+      hide_comment: veşêre
+      unhide_comment: neveşêre
+      comment: Şîrove
       changesetxml: Desteya guhartinan a XML
       osmchangexml: osmChange XML
     paging_nav:
@@ -1933,9 +1938,6 @@ ku-Latn:
         hatiye neçalakkirin.
       js_2: OpenStreetMap ji bo nîşandana nexşeya xwe ya şemetok JavaScriptê bi kar
         tîne.
-      permalink: Lînka daîmî
-      shortlink: Lînka kurt
-      createnote: Notek binivîse
       license:
         copyright: Mafê daneriyê ya OpenStreetMapê û beşdarên me, di bin lîsansa vekirî
           de ne
@@ -2784,13 +2786,6 @@ ku-Latn:
       map_data_zoom_in_tooltip: Ji bo ku daneyên nexşeyê bibînî nêzîk bike
       queryfeature_tooltip: Taybetmendiyan nîşan bide
       queryfeature_disabled_tooltip: Ji bo ku taybetmendiyan bibînî nêzîk bike
-    changesets:
-      show:
-        comment: Şîrove
-        subscribe: Bibe abone
-        unsubscribe: Ji abonetiyê derkeve
-        hide_comment: veşêre
-        unhide_comment: neveşêre
     edit_help: Nexşeyê bide hereketkirin û li cihê ku tu dixwazî biguherînî nêzîk
       bike, piştre jî bitikîne ser vir.
     directions:

config/locales/lb.yml

@@ -440,6 +440,11 @@ lb:
       join_discussion: Loggt Iech an, fir bei der Diskussioun matzemaachen
       still_open: Den Ännerungssaz ass nach op. 'Diskussioun gëtt opgemaach, esoubal
         wéi den Ännerungssaz zou ass.
+      subscribe: Abonéieren
+      unsubscribe: Ofbestellen
+      hide_comment: verstoppen
+      unhide_comment: nees weisen
+      comment: Kommentéieren
       changesetxml: XML mam Set vun Ännerungen
       osmchangexml: osmChange XML
     paging_nav:
@@ -512,6 +517,8 @@ lb:
       title: Blog vun %{user} | %{title}
       user_title: Blog vun %{user}
       discussion: Diskussioun
+      subscribe: Abonéieren
+      unsubscribe: Ofbestellen
       leave_a_comment: Eng Bemierkung maachen
       login_to_leave_a_comment_html: '%{login_link} fir eng Bemierkung ze schreiwen'
       login: Aloggen
@@ -1561,7 +1568,7 @@ lb:
       subject: '[OpenStreetMap] GPX-Import erfollegräich'
     signup_confirm:
       subject: '[OpenStreetMap] Wëllkomm bei OpenStreetMap'
-      greeting: Bonjour !
+      greeting: Moien!
       created: Iergendeen (hoffentlech du) huet grad bei %{site_url} e Benotzerkont
         erstallt
       confirm: Ier mir eppes ënnerhuelen, brauche mir eng Bestätegung, datt dës Ufro
@@ -1905,9 +1912,6 @@ lb:
       js_1: Dir hutt entweder e Browser dee JavaScript net ënnerstëtzt oder Dir hutt
         JavaScript desaktivéiert.
       js_2: OpenStreetMap benotzt JavaScript fir d'Kaartenduerstellung
-      permalink: Permanentlink
-      shortlink: Kuerze Link
-      createnote: Eng Notiz derbäisetzen
       license:
         copyright: Copyright OpenStreetMap a Matwierkend, ënner enger oppener Lizenz
     edit:
@@ -2262,6 +2266,7 @@ lb:
       notes: Notizen op der Kaart
       remove as friend: Frënd ewechhuelen
       add as friend: Frënd derbäisetzen
+      no activity yet: Nach keng Aktivitéit
       email address: 'E-Mail-Adress:'
       status: 'Status:'
       role:
@@ -2465,13 +2470,6 @@ lb:
       map_data_zoom_in_tooltip: Vergréisser d'Kaart, fir 'Donnéeën ze gesinn
       queryfeature_tooltip: Objetsoffro
       queryfeature_disabled_tooltip: Fir Objetsoffro vergréisseren
-    changesets:
-      show:
-        comment: Kommentéieren
-        subscribe: Abonéieren
-        unsubscribe: Ofbestellen
-        hide_comment: verstoppen
-        unhide_comment: nees weisen
     edit_help: Vergréisser a verschib d'Kaart un en Uert, deens du beaarbechte wëlls,
       a klick hei
     directions:

config/locales/lt.yml

@@ -514,8 +514,13 @@ lt:
       join_discussion: Prisijunkite norėdami dalyvauti aptarime
       still_open: Pakeitimas vis dar atidarytas - diskusija prasidės tik uždarius
         pakeitimą.
+      subscribe: Užsisakyti
+      unsubscribe: Atsisakyti
       comment_by_html: Komentaras nuo %{user} %{time_ago}
       hidden_comment_by_html: Paslėptas komentaras nuo %{user} %{time_ago}
+      hide_comment: slėpti
+      unhide_comment: neslėpti
+      comment: Komentuoti
       changesetxml: Pakeitimo XML
       osmchangexml: osmChange XML
     paging_nav:
@@ -2074,9 +2079,6 @@ lt:
       js_1: Jūs arba naudojate naršyklę, nepalaikančią JavaScript, arba išjungėte
         JavaScript palaikymą.
       js_2: OpenStreetMap naudoja JavaScript savo 'slidžiam' žemėlapiui
-      permalink: Nuoroda į šią vietą
-      shortlink: Trumpoji nuoroda
-      createnote: Pridėti pastabą
       license:
         copyright: Teisės priklauso OpenStreetMap ir prie projekto prisidėjusiems,
           pagal atvirą licenciją.
@@ -2964,13 +2966,6 @@ lt:
       map_data_zoom_in_tooltip: Padidinkite, norėdami matyti žemėlapio duomenis
       queryfeature_tooltip: Ieškoti objektų
       queryfeature_disabled_tooltip: Padidinkite, norėdami ieškoti objektų
-    changesets:
-      show:
-        comment: Komentuoti
-        subscribe: Užsisakyti
-        unsubscribe: Atsisakyti
-        hide_comment: slėpti
-        unhide_comment: neslėpti
     edit_help: Pastumkite žemėlapį ir padidinkite vietą, kurią norite keisti, tada
       spauskite čia.
     directions:

config/locales/lv.yml

@@ -366,6 +366,11 @@ lv:
       closed_ago_html: Slēgts %{time_ago}
       discussion: Diskusija
       join_discussion: Ieejiet sistēmā lai pievienotos diskusijai
+      subscribe: Abonēt
+      unsubscribe: Atteikties no abonējuma
+      hide_comment: paslēpt
+      unhide_comment: parādīt
+      comment: Komentēt
       changesetxml: Izmaiņu kopas XML
       osmchangexml: osmChange XML
     paging_nav:
@@ -1546,9 +1551,6 @@ lv:
       js_1: Vai nu jūs lietojat pārlūkprogrammu, kas neatbalsta JavaScript, vai arī
         jūsu pārlūkprogrammā JavaScript ir atslēgts.
       js_2: OpenStreetMap kartes rādīšanai lieto JavaScript.
-      permalink: Pastāvīgā saite
-      shortlink: Īsā saite
-      createnote: Pievienot piezīmi
       license:
         copyright: Autortiesības OpenStreetMap un tā veidotāji, zem atvērtas licences
       remote_failed: Rediģēšana neizdevās - pārbaudi, ka JOSM vai Merkaartor ir ieslēgts
@@ -2232,13 +2234,6 @@ lv:
       map_data_zoom_in_tooltip: Pietuvināt, lai redzētu kartes datus
       queryfeature_tooltip: Vaicājuma funkcijas
       queryfeature_disabled_tooltip: Tuvināt pie kārtas funkcijām
-    changesets:
-      show:
-        comment: Komentēt
-        subscribe: Abonēt
-        unsubscribe: Atteikties no abonējuma
-        hide_comment: paslēpt
-        unhide_comment: parādīt
     edit_help: Pārvieto karti un pietuvini vietai, kuru vēlies labot, tad spied šeit.
     directions:
       ascend: Kāpums

config/locales/mk.yml

@@ -485,8 +485,13 @@ mk:
       join_discussion: Најавете се за да се приклучите во разговорот
       still_open: Измените сè уште се отворени — разговорот ќе се отвори штом ќе се
         затворат измените.
+      subscribe: Претплати се
+      unsubscribe: Отпиши ме
       comment_by_html: Коментар од %{user} %{time_ago}
       hidden_comment_by_html: Скриен коментар од %{user} %{time_ago}
+      hide_comment: скриј
+      unhide_comment: откриј
+      comment: Коментирај
       changesetxml: XML за измените
       osmchangexml: osmChange XML
     paging_nav:
@@ -560,6 +565,8 @@ mk:
       title: Дневникот на %{user} | %{title}
       user_title: Дневникот на %{user}
       discussion: Разговор
+      subscribe: Претплати се
+      unsubscribe: Отпиши ме
       leave_a_comment: Напиши коментар
       login_to_leave_a_comment_html: '%{login_link} за да оставите коментар'
       login: Најава
@@ -1730,8 +1737,8 @@ mk:
           Белешката се наоѓа близу %{place}.'
         commented_note_html: '%{commenter} реши картографска белешка на која имате
           коментирано. Белешката се наоѓа близу %{place}.'
-      details: Поподробно за белешката на %{url}.
+      details: Одговорете или дознајте повеќе за белешката на %{url}.
-      details_html: Поподробно за белешката на %{url}.
+      details_html: Одговорете или дознајте повеќе за белешката на %{url}.
     changeset_comment_notification:
       description: Измени бр. %{id} во OpenStreetMap
       hi: Здраво %{to_user},
@@ -1750,8 +1757,8 @@ mk:
         partial_changeset_with_comment: со коментарот „%{changeset_comment}“
         partial_changeset_with_comment_html: со коментарот „%{changeset_comment}“
         partial_changeset_without_comment: без коментар
-      details: Поподробно за промената на %{url}.
+      details: Одговорете или дознајте повеќе за промената на %{url}.
-      details_html: Поподробно за промената на %{url}.
+      details_html: Одговорете или дознајте повеќе за промената на %{url}.
       unsubscribe: Можете да се отпишете од подновите за овие измени на %{url}.
       unsubscribe_html: Можете да се отпишете од подновите за овие измени на %{url}.
   confirmations:
@@ -2190,9 +2197,6 @@ mk:
       js_1: Или користите прелистувач кој не поддржува JavaScript, или пак сте го
         оневозможиле тој програм.
       js_2: OpenStreetMap користи JavaScript за нејзината лизгава карта.
-      permalink: Постојана врска
-      shortlink: Кратка врска
-      createnote: Додај белешка
       license:
         copyright: Авторски права OpenStreetMap и учесниците, под отворена лиценца
       remote_failed: Уредувањето не успеа - проверете дали е вчитан JOSM или Merkaartor
@@ -2868,6 +2872,8 @@ mk:
       remove as friend: Отстрани од пријатели
       add as friend: Додај во пријатели
       mapper since: 'Картограф од:'
+      last map edit: 'Последно уредување на картата:'
+      no activity yet: Сè уште нема активности
       uid: 'Корисничка назнака:'
       ct status: 'Услови за учество:'
       ct undecided: Неодлучено
@@ -3228,13 +3234,6 @@ mk:
       queryfeature_tooltip: Пребарување на елементи
       queryfeature_disabled_tooltip: Зголеми на пребарувањето на елементи
       embed_html_disabled: Вградувањето на HTML не е достапно за овој слој на картата
-    changesets:
-      show:
-        comment: Коментирај
-        subscribe: Претплати се
-        unsubscribe: Отпиши ме
-        hide_comment: скриј
-        unhide_comment: откриј
     edit_help: Поместете ја картата и приближете во местото што сакате да го уредите,
       па стиснете тука.
     directions:

config/locales/mr.yml

@@ -303,6 +303,7 @@ mr:
     show:
       title: 'बदलसंच: %{id}'
       join_discussion: चर्चेत सहभागी होण्यासाठी सनोंद प्रवेश करा
+      comment: टिप्पणी
       changesetxml: बदलसंच XML
       osmchangexml: osmChange XML
     paging_nav:
@@ -1073,9 +1074,6 @@ mr:
       js_1: आपण जावास्क्रीप्ट चालवू न शकणारा न्याहाळक वापरत आहात, किंवा जावास्क्रीप्ट
         निष्क्रिय आहे.
       js_2: ओपनस्ट्रीटमॅप सरकत्या नकाशासाठी जावास्क्रीप्टचा वापर करते.
-      permalink: शाश्वत दुवा
-      shortlink: लघुदुवा
-      createnote: टीप जोडा
       license:
         copyright: प्रताधिकार ओपनस्ट्रीटमॅप आणि योगदाते, खुल्या परवान्यांतर्गत
       remote_failed: संपादन अयशस्वी - JOSM किंवा Merkaartor चालू केले आहे आणि रिमोट
@@ -1415,9 +1413,6 @@ mr:
       createnote_disabled_tooltip: नकाशावर टीप जोडण्यासाठी झूम करा
       queryfeature_tooltip: वस्तूंची विचारणा
       queryfeature_disabled_tooltip: वस्तूंची विचारणा करण्यासाठी झूम करा
-    changesets:
-      show:
-        comment: टिप्पणी
     directions:
       instructions:
         offramp_right_with_exit: उजवीकडील %{exit}ने बाहेर पडा

config/locales/ms.yml

@@ -383,6 +383,11 @@ ms:
       title: 'Set Ubah: %{id}'
       discussion: Perbincangan
       join_discussion: Daftar masuk untuk perbincangan
+      subscribe: Langgan
+      unsubscribe: Berhenti melanggan
+      hide_comment: sorokkan
+      unhide_comment: Dedahkan
+      comment: Komen
       changesetxml: XML Set Ubah
       osmchangexml: XML osmChange
     paging_nav:
@@ -1545,9 +1550,6 @@ ms:
       js_1: Anda sedang menggunakan pelayar web yang tidak menyokong JavaScript, ataupun
         anda tidak menghidupkan JavaScript.
       js_2: OpenStreetMap menggunakan JavaScript untuk peta licinnya.
-      permalink: Pautan Kekal
-      shortlink: Pautan Ringkas
-      createnote: Tambah nota
       license:
         copyright: Hak cipta OpenStreetMap dan para penyumbang di bawah lesen terbuka
       remote_failed: Penyuntingan gagal - pastikan JOSM atau Merkaartor dimuatkan
@@ -2243,13 +2245,6 @@ ms:
       createnote_disabled_tooltip: Zum dekat untuk meletakkan nota pada peta
       map_notes_zoom_in_tooltip: Zum dekat untuk membaca nota peta
       map_data_zoom_in_tooltip: Zum dekat untuk membaca data peta
-    changesets:
-      show:
-        comment: Komen
-        subscribe: Langgan
-        unsubscribe: Berhenti melanggan
-        hide_comment: sorokkan
-        unhide_comment: Dedahkan
     edit_help: Alihkan peta dan zum dekat pada lokasi yang ingin anda sunting, kemudian
       klik di sini.
     directions:

config/locales/my.yml

@@ -179,6 +179,8 @@ my:
     show:
       discussion: ဆွေးနွေးချက်
       join_discussion: ဆွေးနွေးရန် လော့အင်ဝင်ပါ
+      hide_comment: ဝှက်
+      unhide_comment: မဝှက်တော့ရန်
   changeset_comments:
     comment:
       commented_at_by_html: '%{user} က %{when} အကြာက မွမ်းမံခဲ့သည်'
@@ -634,8 +636,6 @@ my:
       legal_babble:
         title_html: မူပိုင်ခွင့်နှင့် လိုင်စင်
         contributors_title_html: မိမိတို့၏ ပံ့ပို့ပေးသူများ
-    index:
-      permalink: ပုံသေလိပ်စာ
     edit:
       user_page_link: အသုံးပြုသူ စာမျက်နှာ
     export:
@@ -795,10 +795,6 @@ my:
       image: ရုပ်ပုံ
       long_link: လင့်
       download: ဒေါင်းလုဒ်
-    changesets:
-      show:
-        hide_comment: ဝှက်
-        unhide_comment: မဝှက်တော့ရန်
     directions:
       distance: အကွာအဝေး
       time: အချိန်

config/locales/nb.yml

@@ -1,6 +1,7 @@
 # Messages for Norwegian Bokmål (norsk bokmål)
 # Exported from translatewiki.net
 # Export driver: phpyaml
+# Author: 6400
 # Author: Abbe98
 # Author: Citadell
 # Author: Danieldegroot2
@@ -30,7 +31,6 @@
 # Author: SuperPotato
 # Author: The real emj
 # Author: Yupik
-# Author: 6400
 ---
 nb:
   time:
@@ -446,6 +446,11 @@ nb:
       join_discussion: Logg inn for å delta i diskusjonen
       still_open: Endringssettet er fortsatt åpent – diskusjonen åpner når endringssettet
         er lukket.
+      subscribe: Abonner
+      unsubscribe: Avslutt abonnement
+      hide_comment: skjul
+      unhide_comment: vis
+      comment: Kommenter
       changesetxml: XML for endringssett
       osmchangexml: osmChange-XML
     paging_nav:
@@ -1737,9 +1742,6 @@ nb:
       js_1: Du har en nettleser som ikke støtter JavaScript eller så har du slått
         av JavaScript.
       js_2: OpenStreetMap bruker JavaScript på kartsidene.
-      permalink: Permanent lenke
-      shortlink: Kort lenke
-      createnote: Legg til en merknad
       license:
         copyright: Rettighetshaver OpenStreetMap og bidragsytere, under en åpen lisens
       remote_failed: Klarte ikke redigere - forsikre deg at JOSM eller Merkaartor
@@ -2473,13 +2475,6 @@ nb:
       map_data_zoom_in_tooltip: Forstørr utvalg for å se kartdata
       queryfeature_tooltip: Se over elementer
       queryfeature_disabled_tooltip: Forstørr utvalg for å se over elementer
-    changesets:
-      show:
-        comment: Kommenter
-        subscribe: Abonner
-        unsubscribe: Avslutt abonnement
-        hide_comment: skjul
-        unhide_comment: vis
     edit_help: Flytt kartet og forstørr utvalg til et sted du vil redigere, og klikk
       så her.
     directions:

config/locales/nds.yml

@@ -482,9 +482,6 @@ nds:
     copyright:
       native:
         title: Över disse Siet
-    index:
-      permalink: Permalink
-      shortlink: Kortlink
     edit:
       user_page_link: Brukersied
     export:

config/locales/ne.yml

@@ -129,7 +129,7 @@ ne:
       trace:
         user: प्रयोगकर्ता
         visible: देखिने
-        name: नाम
+        name: फाइल नाम
         size: आकार
         latitude: अक्षांश
         longitude: देशान्तर
@@ -148,18 +148,65 @@ ne:
         description: वर्णन
       report:
         category: तपाईँको रिपोर्टको कारण छान्नुहोस्
+        details: कृपया समस्या बारे केही थप विवरणहरू प्रदान गर्नुहोस् (आवश्यक)।
       user:
+        auth_provider: प्रमाणीकरण प्रदायक
+        auth_uid: प्रमाणीकरण युआइडी
         email: इमेल
+        new_email: नयाँ इमेल ठेगाना
         active: सक्रिय
         display_name: देखाउने नाम
-        description: वर्णन
+        description: प्रोफाइल विवरण
         home_lat: अक्षांश
         home_lon: देशान्तर
-        languages: भाषाहरू
+        languages: रुचाइएका भाषाहरू
+        preferred_editor: रुचाइएको सम्पादक
         pass_crypt: पासवर्ड
+        pass_crypt_confirmation: पासवर्ड निश्चित गर्नुहोस्
     help:
       trace:
         tagstring: अल्पविरामले छुट्याएको
+      user:
+        new_email: (सार्वजनिक रूपमा कहिल्यै देखाइएको छैन)
+  datetime:
+    distance_in_words_ago:
+      about_x_hours:
+        one: लगभग %{count} घण्टा अघि
+        other: लगभग %{count} घण्टा अघि
+      about_x_months:
+        one: लगभग %{count} महिना अघि
+        other: लगभग %{count} महिना अघि
+      about_x_years:
+        one: लगभग %{count} घण्टा अघि
+        other: लगभग %{count} घण्टा अघि
+      almost_x_years:
+        one: लगभग %{count} वर्ष पहिले
+        other: लगभग %{count} वर्ष पहिले
+      half_a_minute: आधा मिनेट अघि
+      less_than_x_seconds:
+        one: '%{count} सेकेन्ड भन्दा कम'
+        other: '%{count} सेकेन्ड अघि'
+      less_than_x_minutes:
+        one: '%{count} मिनेट भन्दा कम'
+        other: '%{count} मिनेट अघि'
+      over_x_years:
+        one: लगभग %{count} वर्ष पहिले
+        other: लगभग %{count} वर्ष पहिले
+      x_seconds:
+        one: '%{count} सेकेन्ड अघि'
+        other: '%{count} सेकेन्ड अघि'
+      x_minutes:
+        one: '%{count} मिनेट पहिले'
+        other: '%{count} मिनेट पहिले'
+      x_days:
+        one: '%{count} दिन अघि'
+        other: '%{count} दिन अघि'
+      x_months:
+        one: '%{count} महिना अघि'
+        other: '%{count} महिना अघि'
+      x_years:
+        one: लगभग %{count} वर्ष पहिले
+        other: लगभग %{count} वर्ष पहिले
   editor:
     default: पूर्वस्थापित(अहिलेको %{name})
     id:
@@ -171,15 +218,23 @@ ne:
   auth:
     providers:
       none: कुनै पनि होइन
+      google: गुगल
+      facebook: फेसबुक
+      github: गिटहब
+      wikipedia: विकिपिडिया
   api:
     notes:
       comment:
         commented_at_by_html: '%{user}  द्वारा  %{when} पहिले अद्यावधिक गरिएको'
+      rss:
+        title: ओपनस्ट्रिटम्याप टिप्पणीहरू
       entry:
         comment: टिप्पणी
+        full: पूर्ण टिप्पणी
   account:
     deletions:
       show:
+        title: मेरो खाता मेटाउनुहोस्
         confirm_delete: निश्चित हुनुहुन्छ ?
         cancel: रद्द गर्नुहोस्
   accounts:
@@ -326,6 +381,10 @@ ne:
       title: 'परिवर्तनहरू: %{id}'
       discussion: छलफल
       join_discussion: छलफलमा भाग लिन लग इन गर्नुहोस्
+      subscribe: सदस्यता लिनुहोस्
+      unsubscribe: सदस्यता खारेज गर्नुहोस्
+      hide_comment: लुकाउ
+      comment: टिप्पणी
       changesetxml: चेन्जसेट XML
       osmchangexml: osmChange XML
     paging_nav:
@@ -1002,10 +1061,6 @@ ne:
         more_title_html: थप जान्नको लागि
         contributors_title_html: हाम्रा योगदान कर्ताहरू
         contributors_fr_france: फ्रान्स
-    index:
-      permalink: स्थायी लिङ्क
-      shortlink: छोटो लिङ्क
-      createnote: एक टिप्पणी थप्नुहोस्
     edit:
       user_page_link: प्रयोगकर्ता पृष्ठ
     export:
@@ -1305,12 +1360,6 @@ ne:
         notes: म्याप टिप्पणीहरू
         gps: सार्वजनिक GPS ट्रेसहरू
       make_a_donation: दान गर्नुहोस्
-    changesets:
-      show:
-        comment: टिप्पणी
-        subscribe: सदस्यता लिनुहोस्
-        unsubscribe: सदस्यता खारेज गर्नुहोस्
-        hide_comment: लुकाउ
     directions:
       instructions:
         exit_counts:

config/locales/nl.yml

@@ -551,8 +551,13 @@ nl:
       join_discussion: Meld u aan om mee te praten
       still_open: Wijzigingenset is nog open – overleg gaat open zodra de wijzigingenset
         wordt afgesloten.
+      subscribe: Abonneren
+      unsubscribe: Uitschrijven
       comment_by_html: Reactie van %{user}, %{time_ago}
       hidden_comment_by_html: Verborgen reactie van %{user}, %{time_ago}
+      hide_comment: verbergen
+      unhide_comment: zichtbaar maken
+      comment: Reageren
       changesetxml: Wijzigingenset-XML
       osmchangexml: osmChange-XML
     paging_nav:
@@ -2270,9 +2275,6 @@ nl:
       js_1: U gebruikt een browser die JavaScript niet ondersteunt, of u hebt JavaScript
         uitgeschakeld.
       js_2: OpenStreetMap gebruikt JavaScript voor de slippykaart.
-      permalink: Permanente koppeling
-      shortlink: Korte koppeling
-      createnote: Opmerking toevoegen
       license:
         copyright: Copyright OpenStreetMap en bijdragers, onder een open licentie
       remote_failed: Bewerken is mislukt. Zorg dat JOSM of Merkaartor is geladen en
@@ -3296,13 +3298,6 @@ nl:
       queryfeature_disabled_tooltip: Inzoomen om objecten op te vragen
       embed_html_disabled: Het inbedden van HTML-code is voor deze kaartlaag niet
         mogelijk
-    changesets:
-      show:
-        comment: Reageren
-        subscribe: Abonneren
-        unsubscribe: Uitschrijven
-        hide_comment: verbergen
-        unhide_comment: zichtbaar maken
     edit_help: Verplaats de kaart en zoom in op een plaats die u wilt bewerken. Klik
       daarna hier.
     directions:

config/locales/nn.yml

@@ -1,6 +1,7 @@
 # Messages for Norwegian Nynorsk (norsk nynorsk)
 # Exported from translatewiki.net
 # Export driver: phpyaml
+# Author: 6400
 # Author: Abaksle
 # Author: Amire80
 # Author: Bjorni
@@ -21,7 +22,6 @@
 # Author: Pyscowicz
 # Author: Ranveig
 # Author: Ruila
-# Author: 6400
 ---
 nn:
   time:
@@ -431,8 +431,13 @@ nn:
       join_discussion: Logg inn for å vere med i diskusjonen
       still_open: Endringssettet er framleis ope – det vert opna for diskusjon når
         endringssettet vert lukka.
+      subscribe: Abonnér
+      unsubscribe: Avslutt abonnement
       comment_by_html: Kommentar frå %{user} %{time_ago}
       hidden_comment_by_html: Skylt kommentar frå %{user} %{time_ago}
+      hide_comment: gøym
+      unhide_comment: vis
+      comment: Kommenter
       changesetxml: XML for endringssett
       osmchangexml: osmChange XML
     paging_nav:
@@ -2001,9 +2006,6 @@ nn:
       js_1: Du har ein nettleser som ikkje støttar JavaScript eller så har du slått
         av JavaScript.
       js_2: OpenStreetMap brukar JavaScript på kartsidene.
-      permalink: Permanent lenkje
-      shortlink: Kort lenkje
-      createnote: Legg til ein notis
       license:
         copyright: Kopibeskytta OpenStreetMap og bidragsytarar, under ein open lisens
       remote_failed: Klarte ikkje redigere - forsikre deg at JOSM eller Merkaartor
@@ -2631,13 +2633,6 @@ nn:
       map_data_zoom_in_tooltip: Zoom inn for å sjå kartdata
       queryfeature_tooltip: Finn objekt
       queryfeature_disabled_tooltip: Forstørra for å finna objekt
-    changesets:
-      show:
-        comment: Kommenter
-        subscribe: Abonnér
-        unsubscribe: Avslutt abonnement
-        hide_comment: gøym
-        unhide_comment: vis
     directions:
       ascend: Stigande
       engines:

config/locales/nqo.yml

@@ -398,8 +398,13 @@ nqo:
       join_discussion: ߌ ߜߊ߲߬ߞߎ߲߫ ߞߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߦߌߘߊ ߘߐ߫
       still_open: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߠߎ߬ ߟߊߞߊ߬ߣߍ߲߫ ߦߋ߫ ߡߎߣߎ߲߬ - ߘߊߘߐߖߊߥߏ
         ߘߌ߫ ߘߊߦߟߍ߬ ߣߌ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߠߎ߬ ߕߎ߯ ߘߊ߫ ߕߎ߬ߡߊ ߡߍ߲ ߠߊ߫.
+      subscribe: ߊ߬ ߡߊߝߘߎ߫
+      unsubscribe: ߊ߬ ߡߊߝߘߎߣߍ߲ ߓߐ߫
       comment_by_html: ߞߊ߲߬ߞߎߡߊ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫ %{time_ago} ߡߊ߬
       hidden_comment_by_html: ߞߊ߲߬ߞߎߡߊ ߥߣߊ߬ߙߌ߬ߣߍ߲߬ ߦߋ߫ %{user} ߡߊ߬ %{time_ago} ߟߊ߫
+      hide_comment: ߊ߬ ߢߡߊߘߏ߲߰
+      unhide_comment: ߊ߬ ߟߊ߲ߞߣߍߡߦߊ߫
+      comment: ߡߙߌߣߊ߲
       changesetxml: XML ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
       osmchangexml: ߏ.ߛ.ߡ ߡߝߊ߬ߟߋ߲߬ߠߌ߲ XML
     paging_nav:
@@ -1397,9 +1402,6 @@ nqo:
         more_title_html: ߛߌߦߊߡߊ߲߫ ߜߘߍ߫ ߟߎ߫ ߢߌߣߌ߲ ߦߴߌ ߘߐ߫
         contributors_title_html: ߊ߲ ߠߊ߫ ߓߟߏߡߊߜߍ߲ ߠߎ߬
     index:
-      permalink: ߛߘߌ߬ߜߋ߲߬ ߓߟߏߕߍ߰ߓߊߟߌ
-      shortlink: ߛߘߌ߬ߜߋ߲߬ ߛߎߘߎ߲
-      createnote: ߦߟߌߣߐ ߘߏ߫ ߝߙߊ߬
       license:
         copyright: ߓߊߦߟߍߡߊ߲ ߤߊߞߍ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߣߌ߫ ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ߠߊ ߟߎ߬߸ ߕߦߊ߫ ߘߊߦߟߍ߬ߣߍ߲
           ߞߘߐ߫
@@ -1879,13 +1881,6 @@ nqo:
       map_data_zoom_in_tooltip: ߊ߬ ߡߊߛߊ߬ߡߊ߲߫ ߞߊ߬ ߔߊ߬ߔߘߊ ߟߐ߲ߕߊ ߦߋ߫
       queryfeature_tooltip: ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ ߟߎ߬ ߡߊߢߌ߬ߣߌ߲߬ߞߊ߫
       queryfeature_disabled_tooltip: ߊ߬ ߡߊߛߊ߬ߡߊ߲߫ ߞߊ߬ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ ߘߏ߫ ߟߎ߫ ߡߊߢߌ߬ߣߌ߲߬ߞߊ߫
-    changesets:
-      show:
-        comment: ߡߙߌߣߊ߲
-        subscribe: ߊ߬ ߡߊߝߘߎ߫
-        unsubscribe: ߊ߬ ߡߊߝߘߎߣߍ߲ ߓߐ߫
-        hide_comment: ߊ߬ ߢߡߊߘߏ߲߰
-        unhide_comment: ߊ߬ ߟߊ߲ߞߣߍߡߦߊ߫
     directions:
       engines:
         fossgis_osrm_bike: ߣߍ߰ߛߏ (OSRM)

config/locales/oc.yml

@@ -445,6 +445,11 @@ oc:
       join_discussion: Se connectar per rejónher la discussion
       still_open: Ensemble de modificacions totjorn dobèrt — la discussion se dobrirà
         un còp que l’ensemble de modificacions serà plegat.
+      subscribe: S'inscriure
+      unsubscribe: Se desabonar
+      hide_comment: amagar
+      unhide_comment: desamagar
+      comment: Comentari
       changesetxml: Grop de modificacions XML
       osmchangexml: osmChange XML
     paging_nav:
@@ -1860,9 +1865,6 @@ oc:
       js_1: JavaScript es pas pres en carga pel navigador qu'utilizatz, o alara l’avètz
         desactivat.
       js_2: OpenStreetMap utiliza Javascript per sas mapas lisantas.
-      permalink: Ligam permanent
-      shortlink: Ligam cort
-      createnote: Apondre una nòta
       license:
         copyright: Copyright OpenStreetMap e sos contributors, jos una licéncia dobèrta
       remote_failed: L'edicion a mancat. Asseguratz-vos que lo JOSM o lo Merkaartor
@@ -2517,13 +2519,6 @@ oc:
       map_data_zoom_in_tooltip: Zoomatz per veire las donadas sus la mapa
       queryfeature_tooltip: Requèsta suls objèctes
       queryfeature_disabled_tooltip: Zoomar mai per recercar d'objèctes
-    changesets:
-      show:
-        comment: Comentari
-        subscribe: S'inscriure
-        unsubscribe: Se desabonar
-        hide_comment: amagar
-        unhide_comment: desamagar
     edit_help: Movètz la mapa e fasètz zoom sus una posicion que volètz editar, e
       de contunh, fasètz clic aicí.
     directions:

config/locales/pa.yml

@@ -339,7 +339,7 @@ pa:
       created_ago_by_html: '%{time_ago} ਨੂੰ %{user} ਦੁਆਰਾ ਬਣਾਇਆ ਗਿਆ'
       closed_ago_by_html: '%{time_ago} ਨੂੰ %{user} ਦੁਆਰਾ ਬੰਦ ਕੀਤਾ ਗਿਆ'
       discussion: ਗੱਲ-ਬਾਤ
-      join_discussion: ਚਰਚਾ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣ ਲਈ ਦਾਖ਼ਲ ਹੋਵੋ
+      join_discussion: ਗੱਲਬਾਤ ਵਿੱਚ ਸ਼ਾਮਲ ਹੋਣ ਲਈ ਦਾਖ਼ਲ ਹੋਵੋ
       comment_by_html: '%{user} %{time_ago} ਤੋਂ ਟਿੱਪਣੀ'
       hidden_comment_by_html: '%{user} %{time_ago} ਤੋਂ ਲੁਕਵੀਂ ਟਿੱਪਣੀ'
       changesetxml: ਤਬਦੀਲੀ ਲੜੀ XML
@@ -886,7 +886,7 @@ pa:
       subject: '[ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ] ਉੱਤੇ ਜੀ ਆਈਆਂ ਨੂੰ'
       greeting: ਸਤਿ ਸ੍ਰੀ ਅਕਾਲ ਜੀ!
     email_confirm:
-      subject: '[ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ] ਆਪਣੇ ਈਮੇਲ ਪਤੇ ਦੀ ਪੁਸ਼ਟੀ ਕਰੋ'
+      subject: '[ਖੁੱਲ੍ਹਾ-ਗਲੀ-ਨਕਸ਼ਾ] ਆਪਣੇ ਈਮੇਲ ਪਤੇ ਦੀ ਤਸਦੀਕ ਕਰੋ'
       greeting: ਸਤਿ ਸ੍ਰੀ ਅਕਾਲ,
     lost_password:
       greeting: ਸਤਿ ਸ੍ਰੀ ਅਕਾਲ,
@@ -908,6 +908,8 @@ pa:
       failure: ਵਰਤੋਂਕਾਰ %{name} ਨਹੀਂ ਲੱਭਿਆ।
     confirm_email:
       heading: ਈਮੇਲ ਪਤੇ ਦੀ ਤਬਦੀਲੀ ਤਸਦੀਕ ਕਰਾਉ
+      press confirm button: ਆਪਣੇ ਨਵੇਂ ਈਮੇਲ ਪਤੇ ਦੀ ਤਸਦੀਕ ਕਰਨ ਲਈ ਹੇਠਾਂ ਦਿੱਤੇ ਤਸਦੀਕੀ
+        ਬਟਨ ਨੂੰ ਦਬਾਓ।
       button: ਤਸਦੀਕ ਕਰੋ
   messages:
     inbox:
@@ -1000,10 +1002,6 @@ pa:
           ਹੇਠ ਲਿਖੀਆਂ ਦੋ ਚੀਜ਼ਾਂ ਕਰਨ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ:'
         more_title_html: ਹੋਰ ਜਾਣਕਾਰੀ ਲੱਭਣ ਵਾਸਤੇ
         contributors_title_html: ਸਾਡੇ ਯੋਗਦਾਨੀ
-    index:
-      permalink: ਪੱਕੀ ਕੜੀ
-      shortlink: ਛੋਟੀ ਕੜੀ
-      createnote: ਟਿੱਪਣੀ ਜੋੜੋ
     edit:
       user_page_link: ਵਰਤੋਂਕਾਰ ਵਰਕਾ
       anon_edits_link_text: ਪਤਾ ਕਰੋ ਕਿ ਮਾਮਲਾ ਇਸ ਤਰ੍ਹਾਂ ਕਿਉਂ ਹੈ।

config/locales/pl.yml

@@ -569,8 +569,13 @@ pl:
       join_discussion: Zaloguj się, aby dołączyć do dyskusji
       still_open: Zestaw zmian jest wciąż otwarty – dyskusja będzie możliwa, gdy zostanie
         on zamknięty.
+      subscribe: Obserwuj
+      unsubscribe: Nie obserwuj
       comment_by_html: Komentarz od %{user} %{time_ago}
       hidden_comment_by_html: Ukryty komentarz od użytkownika %{user} %{time_ago}
+      hide_comment: ukryj
+      unhide_comment: pokaż
+      comment: Komentarz
       changesetxml: XML w formacie zestawu zmian
       osmchangexml: XML w formacie osmChange
     paging_nav:
@@ -2197,9 +2202,6 @@ pl:
       js_1: Twoja przeglądarka internetowa nie obsługuje JavaScriptu bądź też masz
         wyłączoną jego obsługę.
       js_2: OpenStreetMap używa JavaScriptu do wyświetlania tej mapy.
-      permalink: Permalink
-      shortlink: Skrócony link
-      createnote: Dodaj uwagę
       license:
         copyright: Prawa autorskie należą do OpenStreetMap i jego autorów na warunkach
           otwartej licencji
@@ -2830,6 +2832,8 @@ pl:
       remove as friend: usuń ze znajomych
       add as friend: dodaj do znajomych
       mapper since: 'Mapuje od:'
+      last map edit: 'Ostatnia edycja mapy:'
+      no activity yet: —
       uid: 'Identyfikator użytkownika:'
       ct status: 'Warunki uczestnictwa:'
       ct undecided: niezdecydowane
@@ -3195,13 +3199,6 @@ pl:
       queryfeature_tooltip: Pobierz i wyświetl obiekty
       queryfeature_disabled_tooltip: Przybliż mapę, aby obejrzeć dane obiektów
       embed_html_disabled: Osadzanie HTML nie jest dostępne dla tej warstwy mapy
-    changesets:
-      show:
-        comment: Komentarz
-        subscribe: Obserwuj
-        unsubscribe: Nie obserwuj
-        hide_comment: ukryj
-        unhide_comment: pokaż
     edit_help: Proszę przesunąć mapę i przybliżyć modyfikowane położenie, a następnie
       kliknąć tutaj.
     directions:

config/locales/pnb.yml

@@ -400,6 +400,9 @@ pnb:
       title: 'تبدیلیاں: %{id}'
       discussion: گل بات
       join_discussion: ایہہ گل بات جوڑن لئی تسیں لوگ‌این کر سکدیو
+      hide_comment: لُکاؤ
+      unhide_comment: نہیں لُکاؤ
+      comment: ٹپݨی کرو
       changesetxml: تبدیلیاں لئی سروت دی فائل
       osmchangexml: تبدیلیاں لئی سروت دی فائل فارماٹ
     paging_nav:
@@ -1504,9 +1507,6 @@ pnb:
     index:
       js_1: تہاڈے براؤزر جاواسکرپٹ نہیں ورتیئے، یا تسیں جاواسکرپٹ بند کیتے سی۔
       js_2: ایس ویب‌سائیٹ دا نقشہ جاواسکرپٹ ورتدا۔
-      permalink: پکی کڑی
-      shortlink: چھوٹی کڑی
-      createnote: نوٹ پایو
       license:
         copyright: اوپن سٹریٹ میپ تے لیکھک لئی آزاد لائیسنس نال ویب سائیٹ چھپیا سی۔
       remote_failed: سودھ کر نہیں سکدے۔ خبرے جو اَیپ چالو تے ریموٹ کنٹرول چالو وکھیو۔
@@ -2069,11 +2069,6 @@ pnb:
       map_data_zoom_in_tooltip: ڈیٹے دکھݨ لئی وڈا کریو
       queryfeature_tooltip: نقشاں لئی پرشن
       queryfeature_disabled_tooltip: نقش دے پرشن لئی وڈا کریو
-    changesets:
-      show:
-        comment: ٹپݨی کرو
-        hide_comment: لُکاؤ
-        unhide_comment: نہیں لُکاؤ
     directions:
       engines:
         fossgis_osrm_bike: سائیکل (او ایس آر ایم)

config/locales/pt-PT.yml

@@ -361,8 +361,8 @@ pt-PT:
     destroy:
       success: Conta apagada.
   browse:
-    deleted_ago_by_html: Eliminado há %{time_ago} por %{user}
+    deleted_ago_by_html: Eliminado %{time_ago} por %{user}
-    edited_ago_by_html: Editado há %{time_ago} por %{user}
+    edited_ago_by_html: Editado %{time_ago} por %{user}
     version: Versão
     redacted_version: Versão reduzida
     in_changeset: Conjunto de alterações
@@ -522,16 +522,21 @@ pt-PT:
       title: 'Conjunto de alterações: %{id}'
       created: 'Criado: %{when}'
       closed: 'Fechado: %{when}'
-      created_ago_html: Criado há %{time_ago}
+      created_ago_html: Criado %{time_ago}
-      closed_ago_html: Fechado há %{time_ago}
+      closed_ago_html: Fechado %{time_ago}
-      created_ago_by_html: Criado há %{time_ago} por %{user}
+      created_ago_by_html: Criado %{time_ago} por %{user}
-      closed_ago_by_html: Fechado há %{time_ago} por %{user}
+      closed_ago_by_html: Fechado %{time_ago} por %{user}
       discussion: Discussão
       join_discussion: Inicia sessão para te juntares à discussão
       still_open: O conjunto de alterações continua aberto. A discussão será iniciada
         assim que o conjunto de alterações for fechado.
-      comment_by_html: Comentário de %{user} há %{time_ago}
+      subscribe: Subscrever
-      hidden_comment_by_html: Comentário ocultado por %{user} há %{time_ago}
+      unsubscribe: Anular subscrição
+      comment_by_html: Comentário de %{user} %{time_ago}
+      hidden_comment_by_html: Comentário ocultado por %{user} %{time_ago}
+      hide_comment: ocultar
+      unhide_comment: desocultar
+      comment: Comentar
       changesetxml: XML do conjunto de alterações
       osmchangexml: XML no formato osmChange
     paging_nav:
@@ -608,6 +613,8 @@ pt-PT:
       title: Diário de %{user} | %{title}
       user_title: Diário de %{user}
       discussion: Discussão
+      subscribe: Subscrever
+      unsubscribe: Cancelar subscrição
       leave_a_comment: Deixar um comentário
       login_to_leave_a_comment_html: '%{login_link} para deixar um comentário'
       login: Iniciar sessão
@@ -2229,9 +2236,6 @@ pt-PT:
       js_1: Está a usar um navegador de Internet que não suporta JavaScript ou tem
         o JavaScript desativado.
       js_2: É necessário ter o JavaScript ativado para visualizar mapas no OpenStreetMap.
-      permalink: Ligação permanente
-      shortlink: Atalho
-      createnote: Adicionar nota
       license:
         copyright: Direitos de autor do OpenStreetMap e seus contribuidores, sob uma
           licença aberta
@@ -2915,6 +2919,8 @@ pt-PT:
       remove as friend: Remover amigo
       add as friend: Adicionar aos amigos
       mapper since: 'A mapear desde:'
+      last map edit: 'Última edição do mapa:'
+      no activity yet: Ainda sem atividade
       uid: 'Id de utilizador:'
       ct status: 'Termos do Contribuidor:'
       ct undecided: Por decidir
@@ -3170,15 +3176,15 @@ pt-PT:
       open_title: Nota não resolvida n.º %{note_name}
       closed_title: Nota resolvida n.º %{note_name}
       hidden_title: Nota oculta n.º %{note_name}
-      event_opened_by_html: Criada por %{user} há %{time_ago}
+      event_opened_by_html: Criada por %{user} %{time_ago}
-      event_opened_by_anonymous_html: Criada por anónimo há %{time_ago}
+      event_opened_by_anonymous_html: Criada por anónimo %{time_ago}
-      event_commented_by_html: Comentada por %{user} há %{time_ago}
+      event_commented_by_html: Comentada por %{user} %{time_ago}
-      event_commented_by_anonymous_html: Comentada por anónimo há %{time_ago}
+      event_commented_by_anonymous_html: Comentada por anónimo %{time_ago}
-      event_closed_by_html: Resolvida por %{user} há %{time_ago}
+      event_closed_by_html: Resolvida por %{user} %{time_ago}
-      event_closed_by_anonymous_html: Resolvida por anónimo há %{time_ago}
+      event_closed_by_anonymous_html: Resolvida por anónimo %{time_ago}
-      event_reopened_by_html: Reativada por %{user} há %{time_ago}
+      event_reopened_by_html: Reativada por %{user} %{time_ago}
-      event_reopened_by_anonymous_html: Reativada por anónimo há %{time_ago}
+      event_reopened_by_anonymous_html: Reativada por anónimo %{time_ago}
-      event_hidden_by_html: Escondida por %{user} há %{time_ago}
+      event_hidden_by_html: Escondida por %{user} %{time_ago}
       report: denunciar esta nota
       anonymous_warning: Esta nota inclui comentários de utilizadores anónimos que
         devem ser confirmados por fonte independente.
@@ -3282,13 +3288,6 @@ pt-PT:
       queryfeature_disabled_tooltip: Amplia para consultares elementos
       embed_html_disabled: A incorporação de HTML não está disponível para esta camada
         do mapa
-    changesets:
-      show:
-        comment: Comentar
-        subscribe: Subscrever
-        unsubscribe: Anular subscrição
-        hide_comment: ocultar
-        unhide_comment: desocultar
     edit_help: Move o mapa, amplia-o no local que pretendes editar e clica aqui.
     directions:
       ascend: Ascenção

config/locales/pt.yml

@@ -531,8 +531,13 @@ pt:
       join_discussion: Entrar para participar da discussão
       still_open: O conjunto de alterações continua em aberto - A discussão será iniciada
         assim que for fechado o conjunto de alterações.
+      subscribe: Inscrever
+      unsubscribe: Cancelar inscrição
       comment_by_html: Comentário de %{user} há %{time_ago}
       hidden_comment_by_html: Comentário ocultado por %{user} há %{time_ago}
+      hide_comment: esconder
+      unhide_comment: exibir
+      comment: Comentar
       changesetxml: XML do conjunto de alterações
       osmchangexml: XML osmChange
     paging_nav:
@@ -2214,9 +2219,6 @@ pt:
       js_1: Você está usando um navegador sem suporte a JavaScript, ou está com o
         JavaScript desativado.
       js_2: O OpenStreetMap usa JavaScript para a navegação dos mapas.
-      permalink: Link permanente
-      shortlink: Link Curto
-      createnote: Incluir uma nota
       license:
         copyright: Direitos autorais do OpenStreetMap e contribuidores sob uma licença
           aberta
@@ -3247,13 +3249,6 @@ pt:
       queryfeature_disabled_tooltip: Aproxime para consultar elementos
       embed_html_disabled: A incorporação de HTML não está disponível para esta camada
         do mapa
-    changesets:
-      show:
-        comment: Comentar
-        subscribe: Inscrever
-        unsubscribe: Cancelar inscrição
-        hide_comment: esconder
-        unhide_comment: exibir
     edit_help: Mover o mapa e ampliar uma localização que pretende editar e clique
       aqui.
     directions:

config/locales/ro.yml

@@ -488,8 +488,13 @@ ro:
       join_discussion: Conectați-vă pentru a vă alătura discuției
       still_open: Setul de schimbări este deschis - discuția se va deschide atunci
         când setul de schimbări este închis.
+      subscribe: Abonare
+      unsubscribe: Dezabonare
       comment_by_html: Comentariu de la %{user} %{time_ago}
       hidden_comment_by_html: Comentariu ascuns de la %{user} %{time_ago}
+      hide_comment: ascunde
+      unhide_comment: arată
+      comment: Comentariu
       changesetxml: Set de modificări XML
       osmchangexml: XML osmChange
     paging_nav:
@@ -2163,9 +2168,6 @@ ro:
       js_1: Utilizați fie un browser care nu acceptă JavaScript, fie aveți JavaScript
         dezactivat.
       js_2: OpenStreetMap folosește JavaScript pentru hărțile goale.
-      permalink: Legătură permanentă
-      shortlink: Legătură scurtată
-      createnote: Adaugă o notă
       license:
         copyright: Drepturi de autor OpenStreetMap și contribuitori, sub licență deschisă
       remote_failed: Editarea a eșuat - asigurați-vă că JOSM sau Merkaartor este încărcat
@@ -3145,13 +3147,6 @@ ro:
       queryfeature_disabled_tooltip: Mărește caracteristicile de interogare
       embed_html_disabled: Încorporarea HTML nu este disponibilă pentru acest strat
         de hartă
-    changesets:
-      show:
-        comment: Comentariu
-        subscribe: Abonare
-        unsubscribe: Dezabonare
-        hide_comment: ascunde
-        unhide_comment: arată
     edit_help: Deplasați harta și măriți o locație pe care doriți să o editați, apoi
       faceți click aici.
     directions:

config/locales/ru.yml

@@ -630,8 +630,13 @@ ru:
       join_discussion: Войдите в систему, чтобы присоединиться к обсуждению
       still_open: Пакет правок ещё открыт. Обсуждение будет доступно, как только пакет
         правок будет закрыт.
+      subscribe: Подписаться
+      unsubscribe: Отписаться
       comment_by_html: Комментарий от %{user} %{time_ago}
       hidden_comment_by_html: Скрытый комментарий от %{user} %{time_ago}
+      hide_comment: скрыть
+      unhide_comment: показать
+      comment: Комментировать
       changesetxml: XML пакета правок
       osmchangexml: osmChange XML
     paging_nav:
@@ -705,6 +710,8 @@ ru:
       title: Дневник пользователя %{user} | %{title}
       user_title: Дневник пользователя %{user}
       discussion: Обсуждение
+      subscribe: Подписаться
+      unsubscribe: Отписаться
       leave_a_comment: Оставить комментарий
       login_to_leave_a_comment_html: '%{login_link}, чтобы оставить комментарий'
       login: Войти
@@ -2205,9 +2212,6 @@ ru:
     index:
       js_1: Вы используете браузер, в котором не поддерживается или отключён JavaScript.
       js_2: OpenStreetMap использует JavaScript для отображения карт.
-      permalink: Постоянная ссылка
-      shortlink: Короткая ссылка
-      createnote: Добавить заметку
       license:
         copyright: Авторские права принадлежат OpenStreetMap и его участникам на условиях
           открытой лицензии
@@ -3168,13 +3172,6 @@ ru:
       queryfeature_tooltip: Что здесь?
       queryfeature_disabled_tooltip: Приблизьте карту для информации об объектах
       embed_html_disabled: Встраивание HTML недоступно для этого слоя карты
-    changesets:
-      show:
-        comment: Комментировать
-        subscribe: Подписаться
-        unsubscribe: Отписаться
-        hide_comment: скрыть
-        unhide_comment: показать
     edit_help: Передвиньте карту и увеличьте место, которые вы хотите править, затем
       кликните здесь.
     directions:

config/locales/sat.yml

@@ -213,6 +213,8 @@ sat:
         belongs_to: ᱚᱱᱚᱞᱤᱭᱟᱹ
     show:
       discussion: ᱜᱟᱞᱢᱟᱨᱟᱣ
+      hide_comment: ᱫᱟᱱᱟᱝ
+      comment: ᱚᱠᱛᱟ
     paging_nav:
       nodes: (%{count}) ᱜᱟᱸᱴᱷᱠᱚ
       ways: (%{count}) ᱦᱚᱨᱠᱚ
@@ -555,8 +557,6 @@ sat:
     copyright:
       native:
         mapping_link: ᱱᱚᱠᱥᱟ ᱛᱮᱭᱟᱨ ᱮᱦᱚᱵ ᱢᱮ
-    index:
-      createnote: ᱠᱷᱟᱴᱚ ᱚᱞ ᱥᱮᱞᱮᱫ ᱢᱮ
     edit:
       user_page_link: ᱵᱮᱵᱦᱟᱨᱤᱭᱟᱜ ᱥᱟᱦᱴᱟ
     export:
@@ -709,10 +709,6 @@ sat:
       edit_tooltip: ᱱᱟᱠᱥᱟ ᱥᱟᱯᱲᱟᱣ ᱢᱮ
       edit_disabled_tooltip: ᱱᱚᱠᱥᱟ ᱥᱟᱯᱲᱟᱣ ᱞᱟᱹᱜᱤᱫᱛᱮ ᱵᱷᱤᱛᱨᱤ ᱥᱮᱫ ᱡᱩᱢ ᱢᱮ
       createnote_tooltip: ᱱᱚᱠᱥᱟ ᱨᱮ ᱠᱷᱟᱴᱟᱹ ᱚᱞ ᱥᱮᱞᱮᱫ ᱢᱮ
-    changesets:
-      show:
-        comment: ᱚᱠᱛᱟ
-        hide_comment: ᱫᱟᱱᱟᱝ
     directions:
       engines:
         fossgis_osrm_bike: ᱵᱟᱭᱥᱟᱭᱠᱤᱞ (OSRM)

config/locales/sc.yml

@@ -465,8 +465,13 @@ sc:
       join_discussion: Intra pro t'aunire a s'arresonu
       still_open: Annantu de modìficas galu abertu - s'arresonu s'at a abèrrere cando
         s'annantu de modìficas s'at a serrare.
+      subscribe: Sutaiscrie·ti
+      unsubscribe: Annulla s'iscritzione
       comment_by_html: Cummentu de %{user} %{time_ago}
       hidden_comment_by_html: Cummentu cuadu de %{user} %{time_ago}
+      hide_comment: cua
+      unhide_comment: ammustra
+      comment: Cummentu
       changesetxml: XML de s'annantu de modìficas
       osmchangexml: XML in formadu osmChange
     paging_nav:
@@ -2148,9 +2153,6 @@ sc:
       js_1: Ses impreende unu navigadore chi non tenet su suportu pro JavaScript o
         as inabilitadu JavaScript.
       js_2: OpenStreetMap impreat JavaScript pro sa mapa dinàmica sua.
-      permalink: Ligàmene permanente
-      shortlink: Ligàmene curtzu
-      createnote: Annanghe una nota
       license:
         copyright: Deretu de autore de OpenStreetMap e de sos collaboradores suos
           suta de una litzèntzia aberta
@@ -3107,13 +3109,6 @@ sc:
       map_data_zoom_in_tooltip: Ismànnia pro bìdere sos datos de sa mapa
       queryfeature_tooltip: Chirca de elementos
       queryfeature_disabled_tooltip: Ismànnia pro chircare elementos
-    changesets:
-      show:
-        comment: Cummentu
-        subscribe: Sutaiscrie·ti
-        unsubscribe: Annulla s'iscritzione
-        hide_comment: cua
-        unhide_comment: ammustra
     edit_help: Move sa mapa, ismànnia in una positzione chi boles modificare e a pustis
       incarca inoghe
     directions:

config/locales/scn.yml

@@ -359,6 +359,11 @@ scn:
       title: 'Gruppu di canciamenti: %{id}'
       discussion: Discussioni
       join_discussion: Pi participari ntâ discussioni trasi
+      subscribe: Abbònati
+      unsubscribe: Annulla l’abbunamentu
+      hide_comment: ammuccia
+      unhide_comment: Ammustra
+      comment: Cummenta
       changesetxml: XML dû gruppu di canciamenti
       osmchangexml: XML osmChange
     paging_nav:
@@ -1361,9 +1366,6 @@ scn:
       js_1: O stai adupirannu nu browser chi nun supporta lu JavaScript, o puru hai
         lu JavaScript disattivatu.
       js_2: OpenStreetMap adòpira lu JavaScript pâ sò cartina scurritura.
-      permalink: Culligamentu pirmanenti
-      shortlink: Culligamentu accurzatu
-      createnote: Agghiunci na nota
       license:
         copyright: Copyright OpenStreetMap e li sò cuntribbutura, sutta a na licenza
           graputa
@@ -2031,13 +2033,6 @@ scn:
       map_data_zoom_in_tooltip: Zumma pi putiri a vìdiri li dati dâ cartina
       queryfeature_tooltip: Arricerca elimenti
       queryfeature_disabled_tooltip: Zumma pi putiri circari l'elimenti
-    changesets:
-      show:
-        comment: Cummenta
-        subscribe: Abbònati
-        unsubscribe: Annulla l’abbunamentu
-        hide_comment: ammuccia
-        unhide_comment: Ammustra
     edit_help: Sposta la cartina e zumma ntôn postu chi voi canciari, e appoi clicca
       ccà.
     directions:

config/locales/sh.yml

@@ -666,9 +666,6 @@ sh:
       js_1: Ili koristite internet preglednik koji ne podržava JavaScript, ili ste
         onemogućili taj program.
       js_2: OpenStreetMap koristi JavaScript za slippy kartu.
-      permalink: Trajni link
-      shortlink: Kratki link
-      createnote: Dodaj bilješku
       license:
         copyright: Autorska prava pripadaju OpenStreetMap-u i doprinositeljima, pod
           otvorenom licencom

config/locales/sk.yml

@@ -64,6 +64,9 @@ sk:
         invalid_email_address: nevyzerá ako platná e-mailová adresa
         email_address_not_routable: nie je routovateľná
         display_name_is_user_n: nemôže byť user_n, pokiaľ n nie je vaše ID používateľa
+      models:
+        user_mute:
+          is_already_muted: je už stlmený/á.
     models:
       acl: Zoznam prístupových práv
       changeset: Sada zmien
@@ -500,8 +503,13 @@ sk:
       join_discussion: Zapojte sa do diskusie
       still_open: Sada zmien stále otvorená - diskusia bude otvorená, keď bude sada
         zmien uzatvorená.
+      subscribe: Odoberať
+      unsubscribe: Zrušiť odoberanie
       comment_by_html: Komentár od používateľa %{user} %{time_ago}
       hidden_comment_by_html: Skrytý komentár od používateľa %{user} %{time_ago}
+      hide_comment: skryť
+      unhide_comment: zobraziť
+      comment: Okomentovať
       changesetxml: XML sady zmien
       osmchangexml: osmChange XML
     paging_nav:
@@ -1710,6 +1718,8 @@ sk:
       no_sent_messages_html: Nemáte odoslané správy. Prečo ste sa nespojili s niekým
         z %{people_mapping_nearby_link}?
       people_mapping_nearby: blízko mapujúci ľudia
+    muted:
+      title: Stlmené správy
     reply:
       wrong_user: Ste prihlásený ako „%{user}“, ale správa, na ktorú chcete odpovedať,
         nebola odoslaná tomuto používateľovi. Ak na ňu chcete odpovedať, prihláste
@@ -1728,6 +1738,7 @@ sk:
     heading:
       my_inbox: Doručená pošta
       my_outbox: Odoslané
+      muted_messages: Stlmené správy
     mark:
       as_read: Správa označená ako prečítaná
       as_unread: Správa označená ako neprečítaná
@@ -1983,9 +1994,6 @@ sk:
     index:
       js_1: Používate prehliadač bez podpory JavaScriptu, alebo máte JavaScript vypnutý.
       js_2: OpenStreetMap používa pre interaktívnu mapu JavaScript.
-      permalink: Trvalý odkaz
-      shortlink: Krátky odkaz
-      createnote: Pridať poznámku
       license:
         copyright: Chránené autorskými právami OpenStreetMap a prispievateľov pod
           slobodnou licenciou
@@ -2336,6 +2344,7 @@ sk:
       oauth1_settings: Nastavenia OAuth 1
       oauth2_applications: Aplikácie OAuth 2
       oauth2_authorizations: Autorizácie OAuth 2
+      muted_users: Stlmení používatelia
     auth_providers:
       openid_logo_alt: Prihlásenie pomocou OpenID
       openid:
@@ -2364,6 +2373,7 @@ sk:
         alt: Prihlásenie sa pomocou AOL OpenID
   oauth:
     authorize:
+      title: Povoľte prístup k vášmu účtu
       request_access_html: Aplikácia %{app_name} požaduje prístup k vášmu kontu (%{user}).
         Vyberte si, či si želáte, aby mala aplikácia nasledujúce oprávnenie. Môžete
         zvoliť ľubovoľný počet oprávnení.
@@ -2377,10 +2387,13 @@ sk:
       allow_write_notes: meniť poznámky.
       grant_access: Udeliť prístup
     authorize_success:
+      title: Požiadavka na autorizáciu povolená
       allowed_html: Udelili ste aplikácii %{app_name} prístup k vášmu účtu.
       verification: Váš overovací kód je %{code}.
     authorize_failure:
+      title: Požiadavka na autorizáciu zlyhala
       denied: Odopreli ste aplikácii %{app_name} prístup k vášmu účtu.
+      invalid: Autorizačný token je neplatný.
     revoke:
       flash: Prístup pre aplikáciu %{application} bol odvolaný.
     permissions:
@@ -2452,6 +2465,7 @@ sk:
   oauth2_authorizations:
     new:
       introduction: Povoliť %{application} prístup k vášmu účtu s nasledovnými oprávneniami?
+      authorize: Autorizovať
     show:
       title: Autorizačný kód
   oauth2_authorized_applications:
@@ -2459,6 +2473,7 @@ sk:
       title: Moje autorizované aplikácie
       application: Aplikácia
       permissions: Oprávnenia
+      last_authorized: Posledná autorizácia
       no_applications_html: Zatiaľ ste nepovolili žiadne %{oauth2} aplikácie.
     application:
       revoke: Odobrať prístup
@@ -2532,6 +2547,7 @@ sk:
       remove as friend: Odstrániť z priateľov
       add as friend: Pridať priateľa
       mapper since: 'Mapuje od:'
+      last map edit: 'Posledná úprava mapy:'
       ct status: 'Podmienky prispievania:'
       ct undecided: Nerozhodnuté
       ct declined: Odmietnuté
@@ -2699,6 +2715,16 @@ sk:
       reason: Dôvod pre blokovanie
       status: Stav
       revoker_name: Zrušil
+  user_mutes:
+    index:
+      title: Stlmení používatelia
+      my_muted_users: Mnou stlmení používatelia
+      table:
+        thead:
+          muted_user: Stlmený používateľ
+    create:
+      notice: Stlmili ste používateľa %{name}.
+      error: Používateľa %{name} nebolo možné stlmiť. %{full_message}.
   notes:
     index:
       title: Poznámky vytvorené alebo komentované používateľom %{user}
@@ -2823,13 +2849,6 @@ sk:
       map_data_zoom_in_tooltip: Priblížením zobrazíte údaje mapy
       queryfeature_tooltip: Prieskum prvkov
       queryfeature_disabled_tooltip: Pre prieskum prvkov priblížte
-    changesets:
-      show:
-        comment: Okomentovať
-        subscribe: Odoberať
-        unsubscribe: Zrušiť odoberanie
-        hide_comment: skryť
-        unhide_comment: zobraziť
     edit_help: Posuňte mapu a priblížte ju na miesto, ktoré chcete upraviť, potom
       kliknite sem.
     directions:

config/locales/skr-arab.yml

@@ -266,6 +266,11 @@ skr-arab:
       created_ago_html: '%{time_ago} خلقیا'
       closed_ago_html: '%{time_ago} بند تھیا'
       discussion: بحث مباحثہ
+      subscribe: سبسکرائب کرو
+      unsubscribe: اݨ سبسکرائب کرو
+      hide_comment: لُکاؤ
+      unhide_comment: ݙکھاؤ
+      comment: تبصرہ
     paging_nav:
       nodes: نوݙاں(%{count})
       ways: رستے(%{count})
@@ -290,6 +295,7 @@ skr-arab:
       newer_entries: نویاں انٹریاں
     show:
       user_title: '%{user} دی ڈائری'
+      subscribe: سبسکرائب کرو
       leave_a_comment: رائے ݙیوو
       login: لاگ ان تھیوو
     diary_entry:
@@ -1158,10 +1164,6 @@ skr-arab:
         contributors_za_south_africa: جنوبی افریقہ
         trademarks_title: ٹریڈ مارک
         trademarks_1_1_trademark_policy: ٹریڈمارک پالیسی
-    index:
-      permalink: پکا لنک
-      shortlink: مختصر لنک
-      createnote: نوٹ شامل کرو
     export:
       title: ٻاہر بھیڄو
       licence: لائیسنس
@@ -1363,13 +1365,6 @@ skr-arab:
       embed: ایچ ٹی ایم ایل
       format: فارمیٹ
       scale: 'پیمانہ:'
-    changesets:
-      show:
-        comment: تبصرہ
-        subscribe: سبسکرائب کرو
-        unsubscribe: اݨ سبسکرائب کرو
-        hide_comment: لُکاؤ
-        unhide_comment: ݙکھاؤ
     directions:
       engines:
         fossgis_valhalla_bicycle: سائیکل (ول ہلا)

config/locales/sl.yml

@@ -533,8 +533,13 @@ sl:
       join_discussion: Prijavite se za pridružitev pogovoru
       still_open: Nabor sprememb je še vedno odprt – pogovor se bo začel, ko bo nabor
         sprememb zaprt.
+      subscribe: Naroči me
+      unsubscribe: Odnaroči
       comment_by_html: Komentar %{user} %{time_ago}
       hidden_comment_by_html: Skrit komentar %{user} %{time_ago}
+      hide_comment: skrij
+      unhide_comment: razkrij
+      comment: Komentiraj
       changesetxml: Nabor sprememb XML
       osmchangexml: osmChange XML
     paging_nav:
@@ -2248,9 +2253,6 @@ sl:
       js_1: Bodisi uporabljate brskalnik, ki ne podpira Javascripta, ali pa je izvajanje
         Javascripta onemogočeno.
       js_2: OpenStreetMap za prikaz zemljevida uporablja Javascript.
-      permalink: Trajna povezava
-      shortlink: Kratka povezava
-      createnote: Dodajte opombo
       license:
         copyright: Avtorske pravice OpenStreetMap in sodelavci, pod odprto licenco
       remote_failed: Urejanje ni uspelo - poskrbite da je JOSM ali Merkaartor naložen
@@ -3281,13 +3283,6 @@ sl:
       queryfeature_tooltip: Preveri značilnosti
       queryfeature_disabled_tooltip: Približajte za preverjanje značilnosti
       embed_html_disabled: Za ta sloj zemljevida vdelava HTML ni na voljo
-    changesets:
-      show:
-        comment: Komentiraj
-        subscribe: Naroči me
-        unsubscribe: Odnaroči
-        hide_comment: skrij
-        unhide_comment: razkrij
     edit_help: Premaknite zemljevid in približajte lokacijo, ki jo želite urediti,
       nato pa kliknite tukaj.
     directions:

config/locales/sr-Latn.yml

@@ -965,8 +965,6 @@ sr-Latn:
     index:
       js_1: Koristite pregledač koji ne podržava javaskript ili ste ga onemogućili.
       js_2: Openstritmap koristi javaskript za prikazivanje mapa.
-      permalink: Trajna veza
-      shortlink: Kratka veza
       remote_failed: Uređivanje nije uspelo. Proverite da li je JOSM ili Merkaartor
         učitan i da je mogućnost daljinskog upravljanja omogućena
     edit:

config/locales/sr.yml

@@ -432,8 +432,13 @@ sr:
       closed_ago_by_html: Затворио(ла) %{user} %{time_ago}
       discussion: Дискусија
       join_discussion: Пријавите се да бисте се придружили дискусији
+      subscribe: Пријави ме
+      unsubscribe: Одјави ме
       comment_by_html: '%{user} коментарисао(ла) пре %{time_ago}'
       hidden_comment_by_html: Сакривени коментар корисника %{user} %{time_ago}
+      hide_comment: сакриј
+      unhide_comment: прикажи
+      comment: Коментариши
       changesetxml: XML скуп промена
       osmchangexml: osmChange XML
     paging_nav:
@@ -1750,9 +1755,6 @@ sr:
     index:
       js_1: Користите прегледач који не подржава јаваскрипт или сте га онемогућили.
       js_2: OpenStreetMap користи јаваскрипт за приказивање мапа.
-      permalink: Трајна веза
-      shortlink: Кратка веза
-      createnote: Додај белешку
       license:
         copyright: Ауторска права Опенстритмап и доприносиоци, под отвореном лиценцом
       remote_failed: Уређивање није успело. Проверите да ли је JOSM или Merkaartor
@@ -2511,13 +2513,6 @@ sr:
       map_data_zoom_in_tooltip: Увећај да видиш податке са карте
       queryfeature_tooltip: Информације о објектима
       queryfeature_disabled_tooltip: Зумирај на информације о објектима
-    changesets:
-      show:
-        comment: Коментариши
-        subscribe: Пријави ме
-        unsubscribe: Одјави ме
-        hide_comment: сакриј
-        unhide_comment: прикажи
     edit_help: Помери карту и увећај на место које хоћеш да уредиш, затим кликни овде.
     directions:
       ascend: Растуће

config/locales/sv.yml

@@ -533,8 +533,13 @@ sv:
       join_discussion: Logga in för att delta i diskussionen
       still_open: Ändringsuppsättningen är fortfarande öppen - diskussionen kommer
         att öppnas när ändringsuppsättning har stängts.
+      subscribe: Prenumerera
+      unsubscribe: Avsluta prenumeration
       comment_by_html: Kommenterades från %{user} %{time_ago}
       hidden_comment_by_html: Dold kommentar från %{user} %{time_ago}
+      hide_comment: dölj
+      unhide_comment: Sluta dölja
+      comment: Kommentera
       changesetxml: XML för ändringsuppsättning
       osmchangexml: osmChange XML
     paging_nav:
@@ -2223,9 +2228,6 @@ sv:
       js_1: Du använder antingen en webbläsare som inte stöder JavaScript, eller så
         har du inaktiverat JavaScript.
       js_2: OpentStreetMap använder JavaScript för slippy-kartan.
-      permalink: Permanent länk
-      shortlink: Kortlänk
-      createnote: Lägg till en anteckning
       license:
         copyright: Upphovsrätten tillhör OpenStreetMap och bidragsgivare, under en
           öppen licens
@@ -3264,13 +3266,6 @@ sv:
       queryfeature_tooltip: Undersök kartobjekt
       queryfeature_disabled_tooltip: Zooma in för att undersöka kartobjekt
       embed_html_disabled: HTML-inbäddning är inte tillgänglig för det här kartlagret
-    changesets:
-      show:
-        comment: Kommentera
-        subscribe: Prenumerera
-        unsubscribe: Avsluta prenumeration
-        hide_comment: dölj
-        unhide_comment: Sluta dölja
     edit_help: Flytta kartan och zooma in på en plats som du vill redigera, klicka
       sedan här.
     directions:

config/locales/te.yml

@@ -429,6 +429,11 @@ te:
       discussion: చర్చ
       join_discussion: చర్చలో పాల్గొనేందుకు లాగినవండి
       still_open: మార్పులసమితి ఇంకా తెరిచే ఉంది - దాన్ని మూసివేయగానే చర్చ తెరుచుకుంటుంది.
+      subscribe: గమనింపులలో చేర్చు
+      unsubscribe: గమనింపులనుండి తొలగించు
+      hide_comment: దాచు
+      unhide_comment: చూపించు
+      comment: వ్యాఖ్య
       changesetxml: మార్పులసమితి XML
       osmchangexml: osmChange XML
     paging_nav:
@@ -1846,10 +1851,6 @@ te:
         infringement_2_1_online_filing_page: ఆన్‌లైన్ ఫైలింగ్ పేజీ
         trademarks_title: ట్రేడ్‌మార్క్‌లు
         trademarks_1_1_trademark_policy: ట్రేడ్మార్క్ విధానం
-    index:
-      permalink: స్థిరలంకె
-      shortlink: చిన్నలింకు
-      createnote: ఓ నోట్‍ను చేర్చండి
     edit:
       user_page_link: వాడుకరి పేజీ
       anon_edits_link_text: ఇది ఇలా ఎందుకుందో తెలుసుకోండి.
@@ -2461,13 +2462,6 @@ te:
       map_data_zoom_in_tooltip: మ్యాపు డేటాను చూసేందుకు జూమిన్ చెయ్యి
       queryfeature_tooltip: క్వెరీ విశేషాలు
       queryfeature_disabled_tooltip: క్వెరీ చిశేషాల కోసం జూమిన్ చెయ్యండి
-    changesets:
-      show:
-        comment: వ్యాఖ్య
-        subscribe: గమనింపులలో చేర్చు
-        unsubscribe: గమనింపులనుండి తొలగించు
-        hide_comment: దాచు
-        unhide_comment: చూపించు
     edit_help: మ్యాపును జరిపి, మీరు సరిదిద్దాలనుకున్న స్థలంపై జూమిన్ చేసి, అప్పుడు
       ఇక్కడ నొక్కండి.
     directions:

config/locales/th.yml

@@ -401,8 +401,13 @@ th:
       discussion: การอภิปราย
       join_discussion: เข้าสู่ระบบเพื่อเข้าร่วมการอภิปราย
       still_open: ชุดการเปลี่ยนแปลงกำลังเปิดอยู่ การอภิปรายจะเริ่มได้หลังจากปิดชุดการเปลี่ยนแปลงแล้ว
+      subscribe: บอกรับข้อมูล
+      unsubscribe: เลิกรับข้อมูล
       comment_by_html: ความคิดเห็นจาก %{user} %{time_ago}
       hidden_comment_by_html: ความคิดเห็นที่ซ่อนอยู่จาก %{user} %{time_ago}
+      hide_comment: ซ่อน
+      unhide_comment: แสดง
+      comment: ความคิดเห็น
       changesetxml: ชุดการเปลี่ยนแปลง XML
       osmchangexml: เอ็กซ์เอ็มแอลของ osmChange
     paging_nav:
@@ -1506,9 +1511,6 @@ th:
     index:
       js_1: ท่านกำลังใช้เบราว์เซอร์ที่ไม่รองรับจาวาสคริปต์ หรือท่านปิดใช้งานจาวาสคริปต์
       js_2: OpenStreetMap ใช้จาวาสคริปต์ในการแสดงแผนที่
-      permalink: ลิงก์ถาวร
-      shortlink: ลิงก์ย่อ
-      createnote: เพิ่มหมายเหตุ
       license:
         copyright: สงวนลิขสิทธิ์โดย OpenStreetMap และผู้มีส่วนร่วม ภายใต้สัญญาอนุญาตแบบเปิด
       remote_failed: การแก้ไขล้มเหลว - ตรวจสอบให้แน่ใจว่าได้โหลด JOSM หรือ Merkaartor
@@ -2073,13 +2075,6 @@ th:
       createnote_tooltip: ใส่หมายเหตุลงในแผนที่
       queryfeature_tooltip: แสดงส่วนประกอบ
       queryfeature_disabled_tooltip: ต้องซูมเข้ามากกว่านี้ จึงจะตรวจสอบส่วนประกอบได้
-    changesets:
-      show:
-        comment: ความคิดเห็น
-        subscribe: บอกรับข้อมูล
-        unsubscribe: เลิกรับข้อมูล
-        hide_comment: ซ่อน
-        unhide_comment: แสดง
     directions:
       ascend: ลาดขึ้น
       engines:

config/locales/tl.yml

@@ -395,6 +395,10 @@ tl:
       join_discussion: Lumagda para sumali sa talakayan
       still_open: Bukas pa rin ang pangkat ng pagbabago - magbubukas ang talakayan
         pag naisara na ang pangkat ng pagbabago.
+      subscribe: Sumuskribi
+      hide_comment: itago
+      unhide_comment: pawalang-bisa ang pag-tago
+      comment: Pumuna
       changesetxml: XML ng pangkat ng pagbabago
       osmchangexml: XML ng osmChange
     paging_nav:
@@ -1546,9 +1550,6 @@ tl:
       js_1: Maaaring gumagamit ka ng isang pantingin-tingin na hindi tumatangkilik
         ng JavaScript, o hindi mo pinagagana ang JavaScript.
       js_2: Ang OpenStreetMap ay gumagamit ng JavaScript para sa madulas nitong mapa.
-      permalink: Permalink
-      shortlink: Maikling kawing
-      createnote: Magdagdag ng tala
       license:
         copyright: Karapatang-sipi ng OpenStreetMap at mga tagapag-ambag nito, sa
           ilalim ng isang bukas na lisensya
@@ -2192,12 +2193,6 @@ tl:
       map_data_zoom_in_tooltip: Lumapit upang makita ang datos ng mapa
       queryfeature_tooltip: Usisain ang mga tampok
       queryfeature_disabled_tooltip: Lumapit upang usisain ang mga tampok
-    changesets:
-      show:
-        comment: Pumuna
-        subscribe: Sumuskribi
-        hide_comment: itago
-        unhide_comment: pawalang-bisa ang pag-tago
     directions:
       ascend: Umakyat
       engines:

config/locales/tr.yml

@@ -2,6 +2,7 @@
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Author: Agaafd
+# Author: Ahmetlii
 # Author: Alerque
 # Author: Alidemirtas
 # Author: Alpkant
@@ -533,8 +534,13 @@ tr:
       join_discussion: Tartışmaya katılmak için lütfen giriş yapın
       still_open: Değişiklik kaydı hâlâ açık - tartışma, değişiklik serisi kapatıldığında
         açılacaktır.
+      subscribe: Abone ol
+      unsubscribe: Abonelikten çık
       comment_by_html: '%{user} tarafından %{time_ago} yapılan yorum'
       hidden_comment_by_html: '%{user} tarafından %{time_ago} yapılan gizli yorum'
+      hide_comment: gizle
+      unhide_comment: göster
+      comment: Yorum
       changesetxml: ' XML değişiklik kaydı'
       osmchangexml: osmChange XML
     paging_nav:
@@ -1244,7 +1250,7 @@ tr:
           scree: Kayşat
           scrub: Çalılık
           shingle: Çakıl tabanlı sahil plaj
-          spring: İlkbahar
+          spring: Pınar/Kaynak
           stone: Taş
           strait: Boğaz
           tree: Ağaç
@@ -2250,9 +2256,6 @@ tr:
       js_1: JavaScript desteklemeyen bir tarayıcı kullanıyorsunuz ya da JavaScript
         devre dışı bırakılmış.
       js_2: OpenStreetMap harita gösterim için JavaScript kullanıyor.
-      permalink: Kalıcı Bağlantı
-      shortlink: Kısa Bağlantı
-      createnote: Bir not ekle
       license:
         copyright: Telif Hakkı OpenStreetMap ve katılımcılar, açık lisans altında
       remote_failed: Düzenleme başarısız - JOSM veya Merkaartor'un yüklendiğinden
@@ -3302,13 +3305,6 @@ tr:
       queryfeature_tooltip: Özellikleri göster
       queryfeature_disabled_tooltip: Özellikler görmek için yakınlaştır
       embed_html_disabled: Bu harita katmanı için HTML yerleştirme kullanılamıyor
-    changesets:
-      show:
-        comment: Yorum
-        subscribe: Abone ol
-        unsubscribe: Abonelikten çık
-        hide_comment: gizle
-        unhide_comment: göster
     edit_help: Haritayı sürükleyip ve düzenleme yapmak istediğiniz konuma yakınlaştırdıktan
       sonra buraya tıklayın.
     directions:

config/locales/tt.yml

@@ -419,6 +419,8 @@ tt:
         мөмкин булыр.
       comment_by_html: '%{user} исемле кулланучыдан шәрех %{time_ago}'
       hidden_comment_by_html: '%{user} исемле кулланучыдан яшерен шәрех %{time_ago}'
+      hide_comment: яшерү
+      unhide_comment: күрсәтү
       changesetxml: Үзгәртүләр өеменең XMLы
       osmchangexml: osmChange XML
     paging_nav:
@@ -987,10 +989,6 @@ tt:
         standard: Стандарт
       layers:
         title: Катламнар
-    changesets:
-      show:
-        hide_comment: яшерү
-        unhide_comment: күрсәтү
     directions:
       ascend: Менү
       engines:

config/locales/uk.yml

@@ -570,8 +570,13 @@ uk:
       join_discussion: Увійдіть в систему, щоб приєднатися до обговорення
       still_open: Набір змін досі відкритий — обговорення буде відкрито, як тільки
         він стане закритим.
+      subscribe: Підписатися
+      unsubscribe: Відписатись
       comment_by_html: Коментар від %{user} %{time_ago}
       hidden_comment_by_html: Прихований коментар від %{user} %{time_ago}
+      hide_comment: приховати
+      unhide_comment: показати
+      comment: Коментар
       changesetxml: Набір змін в XML
       osmchangexml: osmChange XML
     paging_nav:
@@ -2281,9 +2286,6 @@ uk:
     index:
       js_1: Ви користуєтесь оглядачем, в якому не підтримується або відключений JavaScript.
       js_2: OpenStreetMap використовує JavaScript для мапи.
-      permalink: Постійне посилання
-      shortlink: Кор.посил.
-      createnote: Додати нотатку
       license:
         copyright: Авторські права за OpenStreetMap та його учасниками на умовах відкритої
           ліцензії
@@ -3362,13 +3364,6 @@ uk:
       queryfeature_tooltip: Отримати об’єкти
       queryfeature_disabled_tooltip: Наблизитись для отримання об’єктів
       embed_html_disabled: Вбудовування HTML недоступне для цього шару мапи
-    changesets:
-      show:
-        comment: Коментар
-        subscribe: Підписатися
-        unsubscribe: Відписатись
-        hide_comment: приховати
-        unhide_comment: показати
     edit_help: Перемістіть мапу і наблизьтесь до місця, яке ви бажаєте змінити, потім
       клацніть тут.
     directions:

config/locales/vi.yml

@@ -489,8 +489,13 @@ vi:
       join_discussion: Đăng nhập để tham gia thảo luận
       still_open: Bộ thay đổi đang mở – có thể thảo luận sau khi bộ thay đổi được
         đóng.
+      subscribe: Theo dõi
+      unsubscribe: Không theo dõi
       comment_by_html: Nhận xét của %{user} từ %{time_ago}
       hidden_comment_by_html: Nhận xét ẩn của %{user} từ %{time_ago}
+      hide_comment: ẩn
+      unhide_comment: bỏ ẩn
+      comment: Bình luận
       changesetxml: Bộ thay đổi XML
       osmchangexml: osmChange XML
     paging_nav:
@@ -2037,9 +2042,6 @@ vi:
     index:
       js_1: Hoặc trình duyệt của bạn không hỗ trợ JavaScript, hoặc bạn đã tắt JavaScript.
       js_2: OpenStreetMap sử dụng JavaScript cho chức năng bản đồ trơn.
-      permalink: Liên kết Thường trực
-      shortlink: Liên kết Ngắn gọn
-      createnote: Thêm ghi chú
       license:
         copyright: Bản quyền của OpenStreetMap và những người đóng góp, được phát
           hành theo giấy phép mở
@@ -3033,13 +3035,6 @@ vi:
       queryfeature_tooltip: Thăm dò yếu tố
       queryfeature_disabled_tooltip: Phóng to để thăm dò yếu tố
       embed_html_disabled: Chức năng nhúng HTML không có sẵn đối với lớp bản đồ này
-    changesets:
-      show:
-        comment: Bình luận
-        subscribe: Theo dõi
-        unsubscribe: Không theo dõi
-        hide_comment: ẩn
-        unhide_comment: bỏ ẩn
     edit_help: Di chuyển bản đồ và phóng to một vị trí mà bạn muốn sửa đổi, rồi nhấn
       chuột vào đây.
     directions:

config/locales/yi.yml

@@ -80,6 +80,8 @@ yi:
       feed:
         created: געשאַפֿן
         closed: געשלאסן
+    show:
+      hide_comment: באַהאַלטן
   geocoder:
     search_osm_nominatim:
       prefix:
@@ -171,9 +173,6 @@ yi:
       short_url: קורץ URL
       center_marker: צענטרירן מאפע אויף מארקירונג
       view_larger_map: באקוקן גרעסערע מאפע
-    changesets:
-      show:
-        hide_comment: באַהאַלטן
     context:
       show_address: ווײַזן אדרעס
 ...

config/locales/zh-CN.yml

@@ -537,8 +537,13 @@ zh-CN:
       discussion: 讨论
       join_discussion: 登录以加入讨论
       still_open: 变更集依然开放——一旦变更集关闭讨论将开放。
+      subscribe: 订阅
+      unsubscribe: 取消订阅
       comment_by_html: '%{user} 于 %{time_ago} 的评论'
       hidden_comment_by_html: '%{user} 于 %{time_ago} 的隐藏评论'
+      hide_comment: 隐藏
+      unhide_comment: 取消隐藏
+      comment: 评论
       changesetxml: 变更集 XML
       osmchangexml: osmChange XML
     paging_nav:
@@ -608,6 +613,8 @@ zh-CN:
       title: '%{user} 的日记 | %{title}'
       user_title: '%{user}的日记'
       discussion: 讨论
+      subscribe: 订阅
+      unsubscribe: 取消订阅
       leave_a_comment: 留下评论
       login_to_leave_a_comment_html: '%{login_link}以留下评论'
       login: 登录
@@ -2100,9 +2107,6 @@ zh-CN:
     index:
       js_1: 您或许正在使用不支持 JavaScript 的浏览器，或您禁用了 JavaScript。
       js_2: OpenStreetMap 使用 JavaScript 让地图更平滑。
-      permalink: 固定链接
-      shortlink: 短链接
-      createnote: 添加注记
       license:
         copyright: 版权所有 OpenStreetMap及其贡献者，采用开放授权协议
       remote_failed: 编辑失败 - 请确保已加载 JOSM 或 Merkaartor 并启用了远程控制
@@ -2693,6 +2697,8 @@ zh-CN:
       remove as friend: 删除朋友
       add as friend: 添加朋友
       mapper since: 绘图者注册于：
+      last map edit: 最后地图编辑于：
+      no activity yet: 尚无活动
       uid: 用户ID：
       ct status: 贡献者条款：
       ct undecided: 未决定
@@ -3032,13 +3038,6 @@ zh-CN:
       queryfeature_tooltip: 查询特征
       queryfeature_disabled_tooltip: 放大以查询特征
       embed_html_disabled: HTML 嵌入不适用于此地图图层
-    changesets:
-      show:
-        comment: 评论
-        subscribe: 订阅
-        unsubscribe: 取消订阅
-        hide_comment: 隐藏
-        unhide_comment: 取消隐藏
     edit_help: 移动地图并在您想编辑的位置放大，然后点击这里。
     directions:
       ascend: 上升

config/locales/zh-HK.yml

@@ -1096,8 +1096,6 @@ zh-HK:
     destroy:
       title: 登出
   site:
-    index:
-      createnote: 添加註記
     edit:
       not_public: 您尚未把編輯公開。
       not_public_description_html: 您不這樣設定的話就將再無法編輯地圖。您可以在%{user_page}將閣下的編輯設為公開。

config/locales/zh-TW.yml

@@ -40,6 +40,7 @@
 # Author: Tntchn
 # Author: TongcyDai
 # Author: Wehwei
+# Author: WiiUf
 # Author: Winston Sung
 # Author: Wrightbus
 # Author: Xiplus
@@ -289,7 +290,7 @@ zh-TW:
         retain_notes: 若有你的地圖註記與註記評論內容，這將會繼續保留；不過會隱藏起來。
         retain_changeset_discussions: 若有你的變更集討論，這將會繼續保留。
         retain_email: 你的電子郵件地址將會繼續保留。
-        recent_editing_html: 因為你最近有編輯過，目前無法刪除你的帳號。在 %{time} 後才可刪除。
+        recent_editing_html: 因為你最近進行過編輯，目前無法刪除你的帳號。在 %{time} 後才可刪除。
         confirm_delete: 你確定嗎？
         cancel: 取消
   accounts:
@@ -492,8 +493,13 @@ zh-TW:
       discussion: 討論
       join_discussion: 登入以參加討論
       still_open: 變更集仍為開啟 - 討論要在變更集關閉後才會開啟。
+      subscribe: 訂閱
+      unsubscribe: 取消訂閱
       comment_by_html: 來自%{user}%{time_ago}的評論
       hidden_comment_by_html: '%{user}%{time_ago}隱藏評論'
+      hide_comment: 隱藏
+      unhide_comment: 取消隱藏
+      comment: 評論
       changesetxml: 變更集 XML
       osmchangexml: osmChange 格式 XML
     paging_nav:
@@ -563,6 +569,8 @@ zh-TW:
       title: '%{user} 的日記|%{title}'
       user_title: '%{user} 的日記'
       discussion: 討論
+      subscribe: 訂閱
+      unsubscribe: 取消訂閱
       leave_a_comment: 留下評論
       login_to_leave_a_comment_html: '%{login_link}來留下評論'
       login: 登入
@@ -2058,9 +2066,6 @@ zh-TW:
     index:
       js_1: 您使用不支援 JavaScript 的瀏覽器，或者停用了 JavaScript。
       js_2: OpenStreetMap 使用 JavaScript 讓地圖更平順。
-      permalink: 固定連結
-      shortlink: 簡短連結
-      createnote: 新增註記
       license:
         copyright: 版權所有，由 OpenStreetMap 及貢獻者根據開放的授權協議提供
       remote_failed: 編輯失敗 - 請確定已載入 JOSM 或 Merkaartor 並開啟遠端控制選項
@@ -2662,6 +2667,8 @@ zh-TW:
       remove as friend: 移除好友
       add as friend: 加入為好友
       mapper since: 註冊為製圖者日期：
+      last map edit: 最後地圖編輯於：
+      no activity yet: 尚無活動
       uid: 使用者 ID：
       ct status: 貢獻者條款：
       ct undecided: 未決定
@@ -3000,13 +3007,6 @@ zh-TW:
       queryfeature_tooltip: 查詢圖徵
       queryfeature_disabled_tooltip: 放大地圖以查询圖徵
       embed_html_disabled: HTML 內嵌對此地圖圖層不可用
-    changesets:
-      show:
-        comment: 評論
-        subscribe: 訂閱
-        unsubscribe: 取消訂閱
-        hide_comment: 隱藏
-        unhide_comment: 取消隱藏
     edit_help: 將地圖移至你想編輯的位置並放大，然後按這裡。
     directions:
       ascend: 上升