Localisation updates from https://translatewiki.net.

config/locales/af.yml

@@ -160,15 +160,9 @@ af:
         other: '%{count} jaar gelede'
   editor:
     default: Verstek (tans %{name})
-    potlatch:
-      name: Potknip 1
-      description: Potknip 1 (aanlynredigeerder)
     id:
       name: iD
       description: iD (aanlynredigeerder)
-    potlatch2:
-      name: Potknip 2
-      description: Potknip 2 (aanlynredigeerder)
     remote:
       name: Afstandsbeheer
       description: Afstandsbeheer (JOSM of Merkaartor)

config/locales/aln.yml

@@ -831,14 +831,6 @@ aln:
         tuaj.
       user_page_link: faqe përdorues
       anon_edits_link_text: Find out pse kjo është e rastit.
-      flash_player_required_html: Ju duhet me pas Flash player për me përdor Potlatch,
-        Flash editorin e OpenStreetMap. Ju muni <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">me
-        marr Flash Player nga Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Disa
-        mënyra të tjera</a> janë të mundshme për me editu OpenStreetMap.
-      potlatch_unsaved_changes: Ju keni para shpëtimit të ndryshimeve. (Për të ruajtur
-        në Potlatch, ju duhet të asnjërën mënyrë e tanishme ose me pikën e, në qoftë
-        se redaktimi në mënyrë të jetojnë, ose klikoni ruani në qoftë se ju keni një
-        buton të shpëtuar.)
     export:
       area_to_export: Zona për Eksport
       manually_select: Manualisht zgedhe ni zon te ndryshme

config/locales/ar.yml

@@ -21,6 +21,7 @@
 # Author: Mido
 # Author: Mohammed Qubati
 # Author: Mutarjem horr
+# Author: NEHAOUA
 # Author: Omda4wady
 # Author: OsamaK
 # Author: Ruila
@@ -58,7 +59,7 @@ ar:
         create: أرسل
       client_application:
         create: سجِّل
-        update: تعديل
+        update: تحديث
       redaction:
         create: إنشاء تنقيح
         update: حفظ التنقيح
@@ -111,8 +112,17 @@ ar:
       way_tag: سمة طريق
     attributes:
       client_application:
+        name: الاسم (مطلوب)
+        url: ' مسار (URL) للتطبيق الرئيسي (مطلوب)'
         callback_url: رابط الرد
         support_url: رابط الدعم
+        allow_read_prefs: قراءة تفضيلات المستخدم الخاصة بهم
+        allow_write_prefs: تعديل تفضيلات المستخدم الخاصة بهم
+        allow_write_diary: إنشاء إدخالات اليوميات والتعليقات وتكوين صداقات
+        allow_write_api: تعديل الخريطة.
+        allow_read_gpx: قراءة آثار جي بي إس الخاصة بهم
+        allow_write_gpx: رفع آثار جي بي إس.
+        allow_write_notes: تعديل الملاحظات.
       diary_comment:
         body: الجسم
       diary_entry:
@@ -127,21 +137,22 @@ ar:
       trace:
         user: المستخدم
         visible: ظاهر
-        name: الاسم
+        name: اسم الملف
         size: الحجم
         latitude: خط العرض
         longitude: خط الطول
         public: عام
         description: الوصف
-        gpx_file: 'ارفع ملف GPX:'
+        gpx_file: رفع ملف GPX
-        visibility: 'الرؤية:'
+        visibility: الرؤية
-        tagstring: 'الوسوم:'
+        tagstring: الوسوم
       message:
         sender: المرسل
         title: الموضوع
         body: نص الرسالة
         recipient: المستلم
       report:
+        category: حدد سبب التقرير الخاص بك
         details: يُرجَى تقديم بعض التفاصيل حول المشكلة (مطلوب).
       user:
         email: البريد الإلكتروني
@@ -150,6 +161,7 @@ ar:
         description: الوصف
         languages: اللغات
         pass_crypt: كلمة السر
+        pass_crypt_confirmation: أكد كلمة السر
     help:
       trace:
         tagstring: محدد بفواصل
@@ -197,15 +209,9 @@ ar:
     with_name_html: '%{name} (%{id})'
   editor:
     default: الافتراضي (حالياً %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (محرر ضمن المتصفح)
     id:
       name: آي دي
       description: آي دي (محرر عبر المتصفح)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (محرر ضمن المتصفح)
     remote:
       name: تحكم عن بعد
       description: تحكم عن بعد (JOSM أو Merkaartor)
@@ -1608,17 +1614,6 @@ ar:
       user_page_link: صفحة مستخدم
       anon_edits_html: (%{link})
       anon_edits_link_text: ابحث عن السبب لماذا هو هذا الحال.
-      flash_player_required_html: أنت بحاجة لمشغل فلاش لاستخدام Potlatch، محرر فلاش
-        خريطة الشارع المفتوحة. يمكنك <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">تنزيل
-        مشغل الفلاش من موقع أدوبي</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">وهناك
-        خيارات أخرى</a> أيضًا متاحة لتعديل خريطة الشارع المفتوحة.
-      potlatch_unsaved_changes: لديك تغييرات غير محفوظة. (للحفظ في Potlatch؛ يجب إلغاء
-        الطريق أو النقطة الحاليين إن كان التعديل في الوضع الحي، أو انقر فوق حفظ إن
-        كان لديك زر الحفظ.)
-      potlatch2_not_configured: لم يتم تكوين Potlatch 2 - يُرجَى الاطلاع على  http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-        للمزيد من المعلومات
-      potlatch2_unsaved_changes: لديك تغييرات غير محفوظة. (للحفظ في Potlatch 2; يجب
-        النقر فوق حفظ.)
       id_not_configured: لم يتم تكوين آي دي
       no_iframe_support: متصفحك لا يدعم الإطارات المضمنة HTML، والتي هي ضرورية لهذه
         الميزة.

config/locales/arz.yml

@@ -678,13 +678,6 @@ arz:
         يمكنك تعيين تعديلاتك لتظهر بشكل علنى من حسابك %{user_page}.
       user_page_link: صفحه مستخدم
       anon_edits_link_text: ابحث عن السبب لماذا هو هذا الحال.
-      flash_player_required_html: أنت بحاجه لمشغل فلاش لاستخدام Potlatch، محرر فلاش
-        خريطه الشارع المفتوحه. يمكنك <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">تنزيل
-        مشغل الفلاش من موقع أدوبي</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">وهناك
-        خيارات أخرى</a> أيضًا متاحه لتعديل خريطه الشارع المفتوحه.
-      potlatch_unsaved_changes: لديك تغييرات غير محفوظه. (للحفظ فى Potlatch، يجب إلغاء
-        الطريق أو النقطه الحاليين إن كان التعديل فى الوضع المباشر، أو انقر فوق حفظ
-        إن كان لديك زر الحفظ.)
     export:
       area_to_export: المنطقه المطلوب تصديرها
       manually_select: اختر يدويًا منطقه أخرى

config/locales/ast.yml

@@ -162,15 +162,9 @@ ast:
         other: fai %{count} años
   editor:
     default: Predetermináu (anguaño %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (editor nel restolador)
     id:
       name: iD
       description: iD (editor nel navegador)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (editor nel restolador)
     remote:
       name: Control remotu
       description: Control remotu (JOSM o Merkaartor)
@@ -1552,17 +1546,6 @@ ast:
         lo faigas. Puedes marcar les tos ediciones como públiques dende la to %{user_page}.
       user_page_link: páxina d'usuariu
       anon_edits_link_text: Descubri por qué ye'l casu.
-      flash_player_required_html: Necesites un reproductor Flash pa usar Potlatch,
-        l'editor Flash d'OpenStreetMap. Puedes <a href="https://get.adobe.com/flashplayer/">descargar
-        el reproductor Flash d'Adobe.com</a>. Tamién hai disponibles <a href="https://wiki.openstreetmap.org/wiki/Editing">otres
-        opciones</a> pa editar OpenStreetMap.
-      potlatch_unsaved_changes: Tienes cambios ensin guardar. (Pa guardalos en Potlatch,
-        tienes de deseleicionar la vía o puntu actual si tas editando en vivo, o calcar
-        nel botón guardar si apaez esi botón).
-      potlatch2_not_configured: Potlatch 2 nun ta configuráu; visita https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-        pa más información
-      potlatch2_unsaved_changes: Tienes cambios ensin guardar. (Pa guardar en Potlatch
-        2, tienes de calcar en guardar).
       id_not_configured: iD nun ta configuráu
       no_iframe_support: El to navegador nun tien encontu pa los iframes HTML, que
         se necesiten pa esta carauterística.

config/locales/az.yml

@@ -129,15 +129,9 @@ az:
       half_a_minute: yarım dəqiqə əvvəl
   editor:
     default: Susmaya görə (hal-hazırda %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (brauzer üzərindən redaktə)
     id:
       name: iD
       description: iD (brauzerdaxili redaktə)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (brauzer üzərindən redaktə)
     remote:
       name: Uzaqdan idarəetmə
       description: Uzaqdan idarəetmə (JOSM və ya Merkaartor)

config/locales/be-Tarask.yml

@@ -162,15 +162,9 @@ be-Tarask:
         other: '%{count} гады таму'
   editor:
     default: Па змоўчваньні (цяпер %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (рэдактар у браўзэры)
     id:
       name: iD
       description: iD (рэдактар у браўзэры)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (рэдактар у браўзэры)
     remote:
       name: Аддаленае кіраваньне
       description: Аддаленае кіраваньне (JOSM ці Merkaartor)
@@ -1002,18 +996,6 @@ be-Tarask:
         Вы можаце зрабіць Вашыя рэдагаваньні публічнымі на Вашай %{user_page}.
       user_page_link: старонцы карыстальніка
       anon_edits_link_text: Даведацца ў чым справа.
-      flash_player_required_html: Каб выкарыстоўваць Potlatch, флэш-рэдактар для OpenStreetMap,
-        неабходны Flash-плэер. Вы можаце <a href="https://get.adobe.com/flashplayer/">загрузіць
-        Flash-плэер з Adobe.com</a>. Існуюць і <a href="https://wiki.openstreetmap.org/wiki/Editing">іншыя
-        магчымасьці</a> для рэдагаваньня OpenStreetMap.
-      potlatch_unsaved_changes: Вы маеце незахаваныя зьмены. (Для таго каб захаваць
-        зьмены ў Potlatch, Вам неабходна зьняць пазначэньне з цяперашняй дарогі ці
-        пункту, калі рэдагуеце ўжывую, ці націснуць кнопку «захаваць».)
-      potlatch2_not_configured: Potlatch 2 ня быў наладжаны — калі ласка, паглядзіце
-        https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 дзеля дадатковых
-        зьвестак
-      potlatch2_unsaved_changes: Вы маеце незахаваныя зьмены. (Каб захаваць у Potlatch
-        2, Вам неабходна націснуць кнопку «захаваць».)
       no_iframe_support: Ваш браўзэр не падтрымлівае рамкі HTML, якія зьяўляюцца неабходнымі
         для гэтай магчымасьці.
     export:

config/locales/be.yml

@@ -198,15 +198,9 @@ be:
         other: '%{count} гады(оў) таму'
   editor:
     default: Тыповы (зараз %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (браўзэрны рэдактар)
     id:
       name: iD
       description: iD (браўзэрны рэдактар)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (браўзэрны рэдактар)
     remote:
       name: Вонкавы рэдактар
       description: вонкавага рэдактара (JOSM або Merkaartor)
@@ -1582,17 +1576,6 @@ be:
         Вы можаце зрабіць Вашыя рэдагаваньні публічнымі на Вашай %{user_page}.
       user_page_link: старонка карыстальніка
       anon_edits_link_text: Даведацца ў чым справа.
-      flash_player_required_html: Каб выкарыстоўваць рэдактар Potlatch неабходны Flash-плэер.
-        Вы можаце <a href="https://get.adobe.com/flashplayer/">загрузіць Flash-плэер
-        з Adobe.com</a>. Існуюць і <a href="https://wiki.openstreetmap.org/wiki/Editing">іншыя
-        магчымасці</a> для рэдагавання OpenStreetMap.
-      potlatch_unsaved_changes: Маюцца незахаваныя змены. (Для захавання ў Potlatch
-        зніміце вылучэнне з лініі або пункта, калі рэдагуеце ў «жывым» рэжыме, альбо
-        націсніце кнопку «захаваць», калі вы ў рэжыме адкладзенага захавання.)
-      potlatch2_not_configured: Potlatch 2 не быў наладжаны. Калі ласка, паглядзіце
-        https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-      potlatch2_unsaved_changes: Вы маеце незахаваныя змены. (Каб захаваць у Potlatch
-        2, Вам неабходна націснуць кнопку «захаваць».)
       id_not_configured: iD не быў настроены
       no_iframe_support: Ваш браўзэр не падтрымлівае HTML iframe, якія неабходныя
         для гэтай функцыі.

config/locales/bg.yml

@@ -178,15 +178,9 @@ bg:
         other: преди %{count} години
   editor:
     default: По подразбиране (в момента %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (редактор в браузъра)
     id:
       name: iD
       description: iD (редактиране в браузър)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (редактиране в браузър)
     remote:
       name: Дистанционно управление
       description: Дистанционно управление (JOSM или Merkaartor)

config/locales/bn.yml

@@ -182,15 +182,9 @@ bn:
         other: '%{count} বছর আগে'
   editor:
     default: পূর্বনির্ধারিত (বর্তমানে %{name})
-    potlatch:
-      name: পটল্যাচ ১
-      description: পটল্যাচ ১ (ব্রাউজার থেকে সম্পাদনা)
     id:
       name: আইডি
       description: আইডি (ব্রাউজার থেকে সম্পাদনা)
-    potlatch2:
-      name: পটল্যাচ ২
-      description: পটল্যাচ ২ (ব্রাউজার থেকে সম্পাদনা)
     remote:
       name: রিমোট কন্ট্রোল
       description: রিমোট কন্ট্রোল (JOSM অথবা Merkaartor)

config/locales/br.yml

@@ -196,15 +196,9 @@ br:
         other: '%{count} bloaz zo'
   editor:
     default: Dre ziouer (%{name} er mare-mañ)
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (aozer enframmet er merdeer)
     id:
       name: iD
       description: iD (aozer e-barzh ar merdeer)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (aozer enframmet er merdeer)
     remote:
       name: Aozer diavaez
       description: Aozer diavaez (JOSM pe Merkaartor)
@@ -1595,17 +1589,6 @@ br:
         vezañ foran diwar ho %{user_page}.
       user_page_link: pajenn implijer
       anon_edits_link_text: Kavit perak.
-      flash_player_required_html: Ezhomm hoc'h eus eus ul lenner Flash evit implijout
-        Potlatch, aozer flash OpenStreetMap. Gallout a rit <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">pellgargañ
-        Flash Player diwar Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Meur
-        a zibarzh</a> a c'haller kaout evit kemmañ OpenStreetMap.
-      potlatch_unsaved_changes: Kemmoù n'int ket bet enrollet zo ganeoc'h. (Evit enrollañ
-        e Potlatch, e tlefec'h diziuzañ an hent pe ar poent red m'emaoc'h oc'h aozañ
-        er mod bev, pe klikañ war enrollañ ma vez ur bouton enrollañ ganeoc'h.)
-      potlatch2_not_configured: Potlatch 2 n'eo ket bet kefluniet - sellit ouzh https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-        da c'houzout hiroc'h
-      potlatch2_unsaved_changes: Kemmoù n'int ket enrollet zo ganeoc'h. (Evit enrollañ
-        ho kemmoù e Potlach2, klikit war enrollañ)
       id_not_configured: N'eo ket bet kefluniet an ID
       no_iframe_support: N'eo ket ho merdeer evit ober gant iframmoù HTML, hag ezhomm
         zo eus ar re-se evit an arc'hweladur-mañ.

config/locales/bs.yml

@@ -119,15 +119,9 @@ bs:
         tagstring: odvojeno zarezima
   editor:
     default: Zadano (currently %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (uređivač unutar web preglednika)
     id:
       name: iD
       description: iD (uređivač u pregledniku)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 1 (uređivač unutar web preglednika)
     remote:
       name: Udaljena kontrola
       description: Udaljena kontrola (JOSM ili Merkaartor)
@@ -1083,16 +1077,6 @@ bs:
         Možete promjeniti Vaše promjene u javne sa %{user_page}.
       user_page_link: korisnička stranica
       anon_edits_link_text: Otkrijte zašto je to tako.
-      flash_player_required_html: Potreban Vam je Flash player da bi koristili Potlatch,
-        OpenStreetMap Flash uređivač. Možete <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">preuzeti
-        Adobe Flash Player sa Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Neke
-        druge mogućnosti</a> su takođe dostupne za uređivanje OpenStreetMap-a.
-      potlatch_unsaved_changes: Imate nespremljene promjene. (Da bi ste spremili u
-        Potlatch-u, morate odznačiti trenutnu putanju ili tačku, ako uređujete uživo;
-        ili kliknite SPREMITI ako imate to dugme.)
-      potlatch2_not_configured: Potlatch 2 nije konfiguriran - molimo pogledajte http://wiki.openstreetmap.org/wiki/The_Rails_Port
-      potlatch2_unsaved_changes: Imate nespremljene promjene. (Da bi ste spremili
-        u Potlatch 2, trebali bi kliknuti Spremiti.)
       no_iframe_support: Vaš preglednik ne podržava HTML iframes, koji su potrebni
         za ovu značajku.
     export:

config/locales/ca.yml

@@ -210,15 +210,9 @@ ca:
     with_version: '%{id}, v%{version}'
   editor:
     default: Predeterminat (actualment %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (editor integrat en el navegador)
     id:
       name: iD
       description: iD (editor integrat en el navegador)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (editor integrat en el navegador)
     remote:
       name: Control remot
       description: Control remot (JOSM o Merkaartor)
@@ -1798,17 +1792,6 @@ ca:
         vostra %{user_page}.
       user_page_link: pàgina d'usuari
       anon_edits_link_text: Llegeix aquí perquè.
-      flash_player_required_html: Necessiteu un reproductor de Flash per a usar el
-        Potlatch, l'editor Flash de l'OpenStreetMap. Podeu <a href="https://get.adobe.com/flashplayer/"></a>baixar
-        el reproductor Flash Player des del web Adobe.com</a>. També hi ha <a href="http://wiki.openstreetmap.org/wiki/Editing">altres
-        opcions</a> per a editar l'OpenStreetMap.
-      potlatch_unsaved_changes: Teniu canvis sense desar. (Per desar els canvis al
-        Potlatch, desseleccioneu la via o el punt actuals si esteu en mode d'edició
-        en viu o feu clic a "Desa" si teniu un botó "Desa".)
-      potlatch2_not_configured: No s'ha configurat el Potlatch 2 - mireu http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-        per a més informació
-      potlatch2_unsaved_changes: Teniu canvis sense desar. (Per desar els canvis al
-        Potlatch 2, feu clic a "Desa".)
       id_not_configured: iD no s'ha configurat
       no_iframe_support: El vostre navegador no és compatible amb iframes HTML, que
         són necessàries per a aquesta funcionalitat.

config/locales/ce.yml

@@ -150,15 +150,9 @@ ce:
         other: '%{count} шо хьалха'
   editor:
     default: Ӏадйитаран кеп (хӀоттина %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (браузеран тадераг)
     id:
       name: iD
       description: iD (браузеран тадераг)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (браузеран тадераг)
     remote:
       name: Генара лелор
       description: Генара лелор (JOSM я Merkaartor)

config/locales/cs.yml

@@ -210,15 +210,9 @@ cs:
         other: před %{count} lety
   editor:
     default: Výchozí (aktuálně %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (editor v prohlížeči)
     id:
       name: iD
       description: iD (editor v prohlížeči)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (editor v prohlížeči)
     remote:
       name: Dálkové ovládání
       description: Dálkové ovládání (JOSM nebo Merkaartor)
@@ -1828,17 +1822,6 @@ cs:
         editace můžete zveřejnit na %{user_page}.
       user_page_link: uživatelské stránce
       anon_edits_link_text: Proč to tak je?
-      flash_player_required_html: Pokud chcete používat Potlatch, flashový editor
-        OpenStreetMap, potřebujete přehrávač Flashe. Můžete si <a href="https://get.adobe.com/cz/flashplayer">stáhnout
-        Flash Player z Adobe.com</a>. Pro editaci OpenStreetMap existuje <a href="https://wiki.openstreetmap.org/wiki/Cs:Editory?uselang=cs">mnoho
-        dalších možností</a>.
-      potlatch_unsaved_changes: Máte neuložené změny. (V Potlatchi odznačte aktuální
-        cestu nebo bod, pokud editujete v živém režimu, nebo klikněte na tlačítko
-        uložit, pokud tam je.)
-      potlatch2_not_configured: Potlatch 2 není nakonfigurován – podrobnější informace
-        najdete na https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-      potlatch2_unsaved_changes: Máte neuložené změny. (V Potlatch 2 se ukládá kliknutím
-        na tlačítko.)
       id_not_configured: iD nebyl nakonfigurován
       no_iframe_support: Váš prohlížeč nepodporuje vložené HTML rámy (iframes), které
         jsou pro tuto funkci nezbytné.

config/locales/cy.yml

@@ -126,15 +126,9 @@ cy:
         other: llai nag %{count} eiliad yn ôl
   editor:
     default: (currently %{name}) diofyn
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (golygygu gyda'r porwr)
     id:
       name: iD
       description: iD (golygydd y porwr)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (golygu gyda'r porwr)
     remote:
       name: Rheolaeth o bell
       description: Pellreolwr (JOSM neu Merkaartor)

config/locales/da.yml

@@ -199,15 +199,9 @@ da:
         other: '%{count} år siden'
   editor:
     default: Foretrukket (i øjeblikket %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (redigér i browseren)
     id:
       name: iD
       description: iD (redigér i browseren)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (redigér i browseren)
     remote:
       name: Fjernbetjening
       description: Fjernbetjening (JOSM eller Merkaartor)
@@ -1792,18 +1786,6 @@ da:
         gør dette. Du kan gøre dine ændringer offentlige fra din %{user_page}.
       user_page_link: brugerside
       anon_edits_link_text: Find ud af hvorfor.
-      flash_player_required_html: Du har brug for en Flashafspiller for at bruge Potlatch,
-        OpenStreetMap Flash-redigeringsprogrammet. Du kan <a href="https://get.adobe.com/flashplayer/">hent
-        Flash Player fra Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Flere
-        andre indstillinger</a> er også tilgængelige til redigering af OpenStreetMap.
-      potlatch_unsaved_changes: Du har ugemte ændringer (for at gemme i Potlatch skal
-        du afmarkere den nuværende vej eller nuværende punkt hvis du retter i live-tilstand,
-        eller klikke på gem-knappen hvis du har en).
-      potlatch2_not_configured: Potlatch 2 er ikke blevet konfigureret - se venligst
-        https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 for yderligere
-        information
-      potlatch2_unsaved_changes: Du har ugemte ændringer (for at gemme i Potlatch
-        2 skal du trykke på gem-knappen).
       id_not_configured: iD er ikke blevet konfigureret
       no_iframe_support: Din browser understøtter ikke HTML-iframes, hvilket er nødvendigt
         for denne funktion.

config/locales/de.yml

@@ -250,15 +250,9 @@ de:
     with_name_html: '%{name} (%{id})'
   editor:
     default: Voreinstellung (derzeit %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (im Browser eingebetteter Editor)
     id:
       name: iD
       description: iD (im Browser eingebetteter Editor)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (im Browser eingebetteter Editor)
     remote:
       name: Fernsteuerung
       description: externem Editor (JOSM oder Merkaartor)
@@ -1923,18 +1917,6 @@ de:
         %{user_page} tun.
       user_page_link: Einstellungsseite
       anon_edits_link_text: Hier findest du mehr Infos dazu.
-      flash_player_required_html: Du benötigst den Flash Player um Potlatch, den OpenStreetMap-Flash-Editor,
-        zu benutzen. <a href="https://get.adobe.com/flashplayer/">Lade den Flash Player
-        von Adobe.com herunter</a>. <a href="https://wiki.openstreetmap.org/wiki/DE:Editing">Einige
-        andere Möglichkeiten</a>, um OpenStreetMap zu editieren, sind hier beschrieben.
-      potlatch_unsaved_changes: Du hast deine Arbeit noch nicht gespeichert. (Um sie
-        in Potlach zu speichern, klicke auf eine leere Fläche bzw. deselektiere die
-        Linie oder den Knoten, wenn du im Live-Modus editierst oder klicke auf Speichern,
-        wenn ein Speicherbutton vorhanden ist.)
-      potlatch2_not_configured: Potlatch 2 wurde nicht konfiguriert - Bitte besuche
-        https://wiki.openstreetmap.org/wiki/The_Rails_Port
-      potlatch2_unsaved_changes: Es gibt ungesicherte Änderungen. (Du solltest in
-        Potlatch 2 „speichern“ klicken.)
       id_not_configured: iD wurde nicht konfiguriert
       no_iframe_support: Der Browser unterstützt keine HTML-Inlineframes (iframes),
         die für diese Funktion notwendig sind.

config/locales/diq.yml

@@ -134,15 +134,9 @@ diq:
         pass_crypt_confirmation: Parola tesdiq ke
   editor:
     default: Hesabiyaye (%{name}yo nıkayên)
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (browser vurnayoğ)
     id:
       name: iD
       description: iD (browser vurnayoğ)
-    potlatch2:
-      name: Potlatch 1
-      description: Potlatch 2 (browser vurnayoğ)
     remote:
       name: Duri da qontrol
       description: Duri ra Qonrtol (JOSM yana  Merkaartor)

config/locales/dsb.yml

@@ -108,15 +108,9 @@ dsb:
         tagstring: pśez komu wótźělony
   editor:
     default: Standard (tuchylu %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (editor za wobźěłowanje we wobglědowaku)
     id:
       name: iD
       description: iD (we wobglědowaku zasajźony editor)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (editor za wobźěłowanje we wobglědowaku)
     remote:
       name: Zdalokawóźenje
       description: Zdalokawóźenje (JOSM abo Merkaartor)
@@ -1175,17 +1169,6 @@ dsb:
         rowno. Móžoš swóje změny na swójom %{user_page} ako zjawne markěrowaś.
       user_page_link: wužywarskem boku
       anon_edits_link_text: Wuslěź, cogodla tomu tak jo.
-      flash_player_required_html: Trjebaš wótegrajadło Flash, aby wužywał Potlatch,
-        editor Flash OpenStreetMap. Móžoš <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">wótegrajadło
-        Flash z Adobe.com ześěgnuś</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Někotare
-        druge móžnosći</a> stoje teke za wobźěłowanje OpenStreetMap k dispoziciji.
-      potlatch_unsaved_changes: Maš njeskłaźone změny. (Aby składował w Potlatch,
-        ty by dejał aktualny puś abo dypk wótwóliś, jolic wobźěłujoš w livemodusu,
-        abo klikni na Składowaś, jolic maš tłocašk Składowaś.)
-      potlatch2_not_configured: Potlach 2 njejo se konfigurěrował - pšosym glědaj
-        http://wiki.openstreetmap.org/wiki/The_Rails_Port
-      potlatch2_unsaved_changes: Sy njeskładowane změny. (Aby je w Potlatch 2 składował,
-        klikni na "Składowaś".)
       id_not_configured: iD njejo se konfigurěrował
       no_iframe_support: Twój wobglědowak njepódpěrujo HTML-elementy iframe, kótarež
         su trěbne za toś tu funkciju.

config/locales/el.yml

@@ -194,15 +194,9 @@ el:
     with_version: '%{id}, v%{version}'
   editor:
     default: Προεπιλογή (τώρα είναι %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (επεξεργαστής εντός του περιηγητή)
     id:
       name: iD
       description: iD (επεξεργαστής εντός του περιηγητή)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (επεξεργαστής εντός του περιηγητή)
     remote:
       name: Απομακρυσμένος έλεγχος
       description: Απομακρυσμένος έλεγχος (JOSM ή Merkaartor)
@@ -1608,18 +1602,6 @@ el:
         δεν το κάνετε. Μπορείτε να κάνετε τις επεξεργασίες σας δημόσιες από την %{user_page}.
       user_page_link: σελίδα χρήστη
       anon_edits_link_text: Μάθετε γιατί συμβαίνει αυτό.
-      flash_player_required_html: Χρειάζεστε Flash player για να χρησιμοποιήσετε το
-        Potlatch, το Flash πρόγραμμα επεξεργασίας του OpenStreetMap. Μπορείτε να <a
-        href=https://get.adobe.com/flashplayer/">κάνετε λήψη του Flash Player από
-        την τοποθεσία Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Πολλές
-        άλλες επιλογές</a> είναι επίσης διαθέσιμες για επεξεργασία στο OpenStreetMap.
-      potlatch_unsaved_changes: Έχετε μη αποθηκευμένες αλλαγές. (Για να αποθηκεύσετε
-        στο Potlatch, πρέπει να αποεπιλέξτε οποιαδήποτε διαδρομή ή κόμβο, αν επεξεργάζεστε
-        σε ζωντανή λειτουργία, ή απλά πατήστε «Αποθήκευση» εάν έχετε κουμπί αποθήκευσης.)
-      potlatch2_not_configured: Το Potlatch 2 δεν έχει ρυθμιστεί - παρακαλούμε δείτε
-        https://wiki.openstreetmap.org/wiki/The_Rails_Port
-      potlatch2_unsaved_changes: Έχετε μη αποθηκευμένες αλλαγές. (Για να αποθηκεύσετε
-        στο Potlatch 2, πρέπει να κάνετε κλικ στο «Αποθήκευση».)
       id_not_configured: Ο iD δεν έχει ρυθμιστεί
       no_iframe_support: Ο περιηγητής σας δεν υποστηρίζει το στοιχείο iframe του HTML,
         που είναι απαραίτητο για αυτήν την λειτουργία.

config/locales/en-GB.yml

@@ -205,15 +205,9 @@ en-GB:
     with_name_html: '%{name} (%{id})'
   editor:
     default: Default (currently %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (in-browser editor)
     id:
       name: iD
       description: iD (in-browser editor)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (in-browser editor)
     remote:
       name: Remote Control
       description: Remote Control (JOSM or Merkaartor)
@@ -1508,17 +1502,6 @@ en-GB:
       user_page_link: user page
       anon_edits_html: (%{link})
       anon_edits_link_text: Find out why this is the case.
-      flash_player_required_html: You need a Flash player to use Potlatch, the OpenStreetMap
-        Flash editor. You can <a href="https://get.adobe.com/flashplayer/">download
-        Flash Player from Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Several
-        other options</a> are also available for editing OpenStreetMap.
-      potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you
-        should deselect the current way or point, if editing in live mode, or click
-        save if you have a save button.)
-      potlatch2_not_configured: Potlatch 2 has not been configured - please see https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-        for more information
-      potlatch2_unsaved_changes: You have unsaved changes. (To save in Potlatch 2,
-        you should click save.)
       id_not_configured: iD has not been configured
       no_iframe_support: Your browser doesn't support HTML iframes, which are necessary
         for this feature.

config/locales/eo.yml

@@ -191,15 +191,9 @@ eo:
         other: antaŭ %{count} jaroj
   editor:
     default: Implicita (nune %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (en-foliumila redaktilo)
     id:
       name: iD
       description: iD (en-foliumila redaktilo)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (en-foliumila redaktilo)
     remote:
       name: ekstera redaktilo
       description: ekstera redaktilo (JOSM aŭ Merkaartor)
@@ -1822,17 +1816,6 @@ eo:
         ilin kiel publikan ĉe via %{user_page}.
       user_page_link: uzantpaĝo
       anon_edits_link_text: Tie ĉi vi sciiĝis kiel.
-      flash_player_required_html: Por uzi la OpenStreetMap-redaktilon 'Potlatch',
-        vi bezonas la kromprogramon Flash. Vi povas <a href="https://get.adobe.com/flashplayer/">elŝuti
-        Flash Player el retpaĝo de Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Kelkaj
-        aliaj redaktiloj</a> estas disponeblaj por redakti OpenStreetMap.
-      potlatch_unsaved_changes: Vi havas nekonservitajn ŝanĝojn. (Por konservi ŝanĝojn
-        en Potlatch, malelektu nune elektitan linion aŭ punkton se vi redaktas en
-        'rekta reĝimo', aŭ alklaku butonon 'konservi', se ĝi videblas.)
-      potlatch2_not_configured: Potlatch 2 ne estas agordita - legu https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-        por pli da informoj
-      potlatch2_unsaved_changes: Vi havas nekonservitajn ŝanĝojn. (Por konservi ilin
-        en Potlatch 2, alklaku 'konservi'.)
       id_not_configured: iD ne estas agordita
       no_iframe_support: Via foliumilo ne subtenas 'HTML iframes', ili estas bezonataj
         por tiu ĉi eblo.

config/locales/es.yml

@@ -239,18 +239,12 @@ es:
     with_name_html: '%{name} (%{id})'
   editor:
     default: Predeterminado (actualmente %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (editor en el navegador)
     id:
       name: iD
       description: iD (editor en el navegador)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (editor en el navegador)
     remote:
       name: Control remoto
-      description: Control remoto (JOSM o Merkaartor)
+      description: Control remoto (JOSM, Potlatch o Merkaartor)
   auth:
     providers:
       none: Ninguno
@@ -832,7 +826,7 @@ es:
           platform: Plataforma
           primary: Carretera primaria
           primary_link: Carretera primaria
-          proposed: Carretera proyectada
+          proposed: Vía en proyecto
           raceway: Pista de carreras
           residential: Calle
           rest_area: Área de descanso
@@ -1268,7 +1262,7 @@ es:
           "yes": Tienda
         tourism:
           alpine_hut: Refugio de montaña
-          apartment: Apartamento de vacaciones
+          apartment: Apartamento turístico
           artwork: Obra de arte
           attraction: Atracción turística
           bed_and_breakfast: Alojamiento y desayuno (B&B)
@@ -1838,17 +1832,6 @@ es:
         haga. Puede marcar sus ediciones como públicas desde su %{user_page}.
       user_page_link: página de usuario
       anon_edits_link_text: Descubra a que se debe
-      flash_player_required_html: Necesita un reproductor de Flash para usar Potlatch,
-        el editor Flash de OpenStreetMap. Puede <a href="https://get.adobe.com/flashplayer/">descargar
-        un reproductor Flash desde Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Otras
-        opciones</a> también están disponibles para editar OpenStreetMap.
-      potlatch_unsaved_changes: Tiene cambios sin guardar. (Para guardarlos en Potlatch,
-        debería deseleccionar la vía o punto actual si está editando en directo, o
-        pulse sobre guardar si aparece un botón de guardar.)
-      potlatch2_not_configured: No se ha configurado Potlatch 2. Consulta https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-        para más información
-      potlatch2_unsaved_changes: Tiene cambios sin guardar. (Para guardar en Potlatch
-        2, debe hacer clic en guardar).
       id_not_configured: iD no ha sido configurado
       no_iframe_support: Su navegador no soporta iframes HTML, que son necesarios
         para esta funcionalidad.
@@ -1963,6 +1946,9 @@ es:
         url: https://wiki.openstreetmap.org/wiki/ES:Main_Page
         title: Wiki de OpenStreetMap
         description: Explora el wiki para obtener documentación detallada de OpenStreetMap.
+    potlatch:
+      desktop_html: Aún puede utilizarse Potlatch mediante la <a href="https://www.systemed.net/potlatch/">descarga
+        de la aplicación de escritorio para Mac y Windows</a>.
     sidebar:
       search_results: Resultados de la búsqueda
       close: Cerrar

config/locales/et.yml

@@ -169,15 +169,9 @@ et:
         other: '%{count} aasta eest'
   editor:
     default: Vaikimisi (praegu %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (brauseripõhine redaktor)
     id:
       name: iD
       description: iD (brauseripõhine redaktor)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (brauseripõhine redaktor)
     remote:
       name: Kaugjuhtimine
       description: Kaugjuhtimine (JOSM või Merkaartor)
@@ -1339,18 +1333,6 @@ et:
         muuta oma muudatused avalikuks lehel %{user_page}.
       user_page_link: kasutajaleht
       anon_edits_link_text: Uuri välja, miks see on nii.
-      flash_player_required_html: Sa vajad Flashi esitajat, et kasutada Potlatchi,
-        OpenStreetMapi Flashi-põhist toimetit. Saad <a href="https://get.adobe.com/flashplayer/">Flash
-        Playeri alla laadida saidilt Adobe.com</a>. Selleks, et OpenStreetMapi redigeerida,
-        on olemas ka <a href="https://wiki.openstreetmap.org/wiki/Editing">mitmeid
-        teisi võimalusi</a>.
-      potlatch_unsaved_changes: Sul on salvestamata muudatusi. (Et salvestada Potlatchis
-        peaksid sa tühistama valitud joone või punkti kui sa redigeerid live-režiimis,
-        või kliki Salvesta nuppu, kui see on nähtaval.)
-      potlatch2_not_configured: Potlatch 2 pole häälestatud. Lisateavet vaata palun
-        asukohast https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-      potlatch2_unsaved_changes: Sul on salvestamata muudatusi. (Et salvestada programmis
-        Potlatch 2, peaksid klikkima Salvesta nuppu.)
       id_not_configured: iD ei ole seadistatud
       no_iframe_support: Sinu brauser ei toeta  HTML-i funktsiooni "iframes", mis
         on vajalik selle režiimi toimimiseks.

config/locales/eu.yml

@@ -129,15 +129,9 @@ eu:
         tagstring: koma mugatua
   editor:
     default: Lehenetsia (orain %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (nabigatzaile barneko editorea)
     id:
       name: iD
       description: iD (nabigatzaile barneko editorea)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (nabigatzaile barneko editorea)
     remote:
       name: Urrutiko agintea
       description: Urrutiko kontrola (JOSM edo Merkaartor)
@@ -1503,18 +1497,6 @@ eu:
         Aldaketak publiko gisa ezar ditzakezu zure %{user_page}-tik.
       user_page_link: Lankide orria
       anon_edits_link_text: Aurkitu zergatik hau kasua den.
-      flash_player_required_html: Potlatch, OpenStreetMap Flash editorea erabiltzeko
-        Flash erreproduzitzailea behar duzu. <a href="https://get.adobe.com/flashplayer/">download
-        Flash Player from Adobe.com</a> Adobe Flash Player-tik deskargatu dezakezu
-        </a>. <a href="https://wiki.openstreetmap.org/wiki/Editing"> Beste hainbat
-        aukera </a> ere eskuragarri daude OpenStreetMap editatzeko.
-      potlatch_unsaved_changes: Aldaketak gorde gabe dituzu. (Potlatch-en gordetzeko,
-        uneko bidea edo puntuazioa desautatu beharko zenituzke, modu zuzenean editatzen
-        baduzu, edo egin klik gorde botoian.)
-      potlatch2_not_configured: Potlacth 2 ez da konfiguratu - mesedez ikusi https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-        informazio gehiagorako
-      potlatch2_unsaved_changes: Gorde gabeko aldaketak dituzu. (Potlatch 2 gordetzeko,
-        egin klik gorde botoian.)
       id_not_configured: iD-a ez da konfiguratu
       no_iframe_support: Zure nabigatzaileak ez ditu onartzen HTML iframe-ak, funtzio
         honetarako ezinbestekoak direnak.

config/locales/fa.yml

@@ -204,15 +204,9 @@ fa:
         other: '%{count} سال پیش'
   editor:
     default: پیش‌فرض (در حال حاضر %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (ویرایشگر در مرورگر)
     id:
       name: iD
       description: iD (ویرایشگر در مرورگر)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (ویرایشگر در مرورگر)
     remote:
       name: کنترل از دور
       description: کنترل از دور (JOSM یا Merkaartor)
@@ -1744,17 +1738,6 @@ fa:
       user_page_link: صفحهٔ کاربری
       anon_edits_html: (%{link})
       anon_edits_link_text: بفهمید چرا این‌طور است.
-      flash_player_required_html: برای استفاده از  Potlatch (ویرایشگر فلش  OpenStreetMap)
-        به فلش‌پلیر نیاز دارید. می‌توانید <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">فلش‌پلیر
-        را از  Adobe.com دانلود کنید</a>. <a href="http://wiki.openstreetmap.org/wiki/Fa:Editing">چندین
-        گزینهٔ دیگر</a> نیز برای ویرایش OpenStreetMap وجود دارد.
-      potlatch_unsaved_changes: شما تغییرات ذخیره‌نشده دارید. (برای ذخیره در Potlatch،
-        اگر در حالت زنده ویرایش می‌کنید، باید راه یا نقطهٔ جاری را از حالت انتخاب
-        درآورید، یا اگر دکمهٔ ذخیره را دارید روی آن کلیک کنید.)
-      potlatch2_not_configured: Potlatch 2 پیکربندی نشده - برای اطلاعات بیشتر https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-        را ببینید.
-      potlatch2_unsaved_changes: شما تغییرات ذخیره‌نشده دارید.(برای ذخیره در Potlatch
-        2، شما باید روی ذخیره کلیک کنید.)
       id_not_configured: iD پیکربندی نشده است
       no_iframe_support: مرورگر شما فریم‌های HTML را، که برای این ویژگی لازم است،
         پشتیبانی نمی‌کند.

config/locales/fi.yml

@@ -208,15 +208,9 @@ fi:
         other: '%{count} vuotta sitten'
   editor:
     default: Oletus (tällä hetkellä %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (selainkäyttöinen muokkain)
     id:
       name: iD
       description: iD (selainkäyttöinen muokkain)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (selainkäyttöinen muokkain)
     remote:
       name: Kauko-ohjaus
       description: Kauko-ohjaus (JOSM tai Merkaartor)
@@ -1679,17 +1673,6 @@ fi:
         muokkauksesi julkisiksi. Voit vaihtaa asetuksen %{user_page}-sivulta.
       user_page_link: käyttäjätiedot
       anon_edits_link_text: Perustelut (englanniksi) julkisuusvaatimukselle.
-      flash_player_required_html: Potlatch-karttamuokkausohjelman käyttö edellyttää
-        Flash Player -lisäosan asentamista. Lataa Flash Player sitä ylläpitävän <a
-        href="http://get.adobe.com/flashplayer/">Adoben verkkosivuilta</a>. Karttaa
-        voi muokata myös <a href="https://wiki.openstreetmap.org/wiki/Fi:Editing">muilla
-        ohjelmistoilla</a>.
-      potlatch_unsaved_changes: Tallentamattomia muutoksia. Tallenna muutokset Potlatchissa
-        poistamalla valinta nykyiseltä karttakohteelta tai napsauta Tallenna-painiketta,
-        jos sellainen on käytössä.
-      potlatch2_not_configured: Potlatch 2 ei ole määritetty - Katso lisätietoja https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-      potlatch2_unsaved_changes: Karttaan on tehty tallentamattomia muutoksia. Tallenna
-        muokkaukset Potlatch 2:ssa napsauttamalla Tallenna-painiketta.
       id_not_configured: iD-ohjelmaa ei ole asetettu
       no_iframe_support: Käytössä oleva selain ei tue HTML-kehyksiä, joka vaaditaan
         tämän toiminnon käyttämiseen.

config/locales/fit.yml

@@ -149,15 +149,9 @@ fit:
         other: '%{count} vuotta sitten'
   editor:
     default: Oletus (tällä hetkellä %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (selainkäyttöinen mookkain)
     id:
       name: iD
       description: iD (selainkäyttöinen mookkain)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (selainkäyttöinen mookkain)
     remote:
       name: Kauko-ohjaus
       description: Kauko-ohjaus (JOSM eli Merkaartor)

config/locales/fr.yml

@@ -246,18 +246,12 @@ fr:
     with_name_html: '%{name} (%{id})'
   editor:
     default: Par défaut (actuellement %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (éditeur intégré au navigateur)
     id:
       name: iD
       description: iD (éditeur intégré au navigateur)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (éditeur intégré au navigateur)
     remote:
       name: Éditeur externe
-      description: Éditeur externe (JOSM ou Merkaartor)
+      description: Éditeur externe (JOSM, Porlatch, Merkaartor)
   auth:
     providers:
       none: Aucun
@@ -1917,18 +1911,6 @@ fr:
       user_page_link: page utilisateur
       anon_edits_html: (%{link})
       anon_edits_link_text: Trouvez pourquoi ici.
-      flash_player_required_html: Vous avez besoin d’un lecteur Flash pour utiliser
-        Potlatch, l’éditeur sous Flash d’OpenStreetMap. Vous pouvez <a href="https://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">télécharger
-        Flash Player depuis le site d’Adobe</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">D’autres
-        options</a> sont également disponibles pour modifier OpenStreetMap.
-      potlatch_unsaved_changes: Vous avez des modifications non enregistrées. (Pour
-        enregistrer dans Potlatch, désélectionnez la ligne ou le nœud actuel lors
-        d’une modification en direct, ou cliquez sur le bouton Enregistrer s’il est
-        affiché.)
-      potlatch2_not_configured: Potlatch 2 n’a pas été configuré – Veuillez consulter
-        https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 pour plus d’informations.
-      potlatch2_unsaved_changes: Vous avez des modifications non enregistrées. (Pour
-        enregistrer vos modifications dans Potlach 2, cliquez sur le bouton Enregistrer)
       id_not_configured: iD n’a pas été configuré
       no_iframe_support: Votre navigateur ne prend pas en charge les ''iframes HTML'',
         qui sont nécessaires pour cette fonctionnalité.
@@ -2044,6 +2026,15 @@ fr:
         url: https://wiki.openstreetmap.org/wiki/FR:Page_principale
         title: Wiki d’OpenStreetMap
         description: Parcourez le wiki pour la documentation approfondie d’OpenStreetMap.
+    potlatch:
+      removed: Votre éditeur OpenStreetMap par défaut est fixé à Potlatch. Comme Adobe
+        Flash Player a été retiré, Potlatch n’est plus disponible à l’utilisation
+        dans un navigateur web.
+      desktop_html: Vous pouvez toujours utiliser Potlatch en <a href="https://www.systemed.net/potlatch/">téléchargeant
+        l’application de bureau pour Mac et Windows</a>.
+      id_html: Sinon, vous pouvez définir votre éditeur par défaut à iD, qui tourne
+        dans votre navigateur web comme Potlatch auparavant. <a href="%{settings_url}">Modifier
+        vos préférences ici</a>.
     sidebar:
       search_results: Résultats de la recherche
       close: Fermer

config/locales/fur.yml

@@ -102,15 +102,9 @@ fur:
         tagstring: separâts di virgulis
   editor:
     default: Predeterminât (par cumò %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (editôr tal sgarfadôr)
     id:
       name: iD
       description: iD (editôr tal sgarfadôr)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (editôr tal sgarfadôr)
     remote:
       name: Remote Control
       description: Remote Control (JOSM o Merkaartor)
@@ -833,15 +827,6 @@ fur:
         Tu puedis impuestâ come publics i tiei cambiaments de tô %{user_page}.
       user_page_link: pagjine dal utent
       anon_edits_link_text: Discuvierç parcè che al è cussì.
-      flash_player_required_html: Ti covente un riprodutôr Flash par doprâ Potlatch,
-        l'editôr Flash di OpenStreetMap. Tu puedis <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">discjamâ
-        il Flash Player di Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">E
-        je cualchi altre opzion</a> par lavorâ su OpenStreetMap.
-      potlatch_unsaved_changes: Tu âs cambiaments no salvâts. (Par salvâ in Potlatch,
-        tu varessis di deselezionâ il percors o il pont atuâl, se tu stâs lavorant
-        in modalitât live, o fracâ su Salve se tu viodis un boton Salve.)
-      potlatch2_unsaved_changes: Tu âs cambiaments no salvâts. (Par salvâ in Potlatch
-        2, tu scugnis fracâ sul boton pal salvataç)
       no_iframe_support: Il to sgarfadôr nol supuarte i iframes HTML, che a coventin
         par cheste funzion.
     export:

config/locales/ga.yml

@@ -102,15 +102,9 @@ ga:
         tagstring: teormharcáilte le camóga
   editor:
     default: Réamhshocraithe (%{name} faoi láthair)
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (eagathóir sa bhrabhsálaí)
     id:
       name: iD
       description: iD (eagathóir sa bhrabhsálaí)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (eagathóir sa bhrabhsálaí)
     remote:
       name: Cianrialú
       description: Cianrialú (JOSM nó Merkaartor)
@@ -1350,18 +1344,6 @@ ga:
         poiblí ar do %{user_page}.
       user_page_link: leathanach úsáideora
       anon_edits_link_text: Faigh amach cén fáth ar amhlaidh atá.
-      flash_player_required_html: Beidh seinnteoir Flash ag teastáil uait chun Potlatch,
-        eagarthóir Flash OpenStreetMap, a úsáid. Is féidir leat <<a href="https://get.adobe.com/flashplayer/">Seinnteoir
-        Flash a íoslódáil ó Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Tá
-        cúpla rogha eile</a> ar fáil freisin chun eagarthóireacht a dhéanamh ar OpenStreetMap.
-      potlatch_unsaved_changes: Tá athruithe nár sábháladh déanta agat. (Chun sábháil
-        i bPotlatch, ba cheart duit an bealach nó poine reatha a dhíroghnú, má tá
-        tú i mbun eagarthóireachta sa mhód beo, nó cliceáil ar sábháil má tá cnaipe
-        sábhála le feiceáil).
-      potlatch2_not_configured: Níor cumraíodh Potlatch 2 - féach https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-        chun tuilleadh eolais a fháil
-      potlatch2_unsaved_changes: Tá athruithe nár sábháladh déanta agat. (Chun sábháil
-        a dhéanamh i bPotlatch2 , ba chóir duit cliceáil ar 'sábháil'.
       id_not_configured: Níor cumraíodh iD
       no_iframe_support: Ní thacaíonn do bhrabhsálaí leis an ngné 'iframe' de chuid
         HTML, rud atá riachtanach don ghné seo.

config/locales/gd.yml

@@ -115,15 +115,9 @@ gd:
     with_name_html: '%{name} (%{id})'
   editor:
     default: Bun-roghainn (%{name} an-dràsta)
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (deasaiche am broinn a' bhrabhsair)
     id:
       name: iD
       description: iD (deasaiche am broinn a' bhrabhsair)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (deasaiche am broinn a' bhrabhsair)
     remote:
       name: Inneal-smachd cèin
       description: Inneal-smachd cèin (JOSM no Merkaartor)
@@ -1302,19 +1296,6 @@ gd:
       user_page_link: duilleag a' chleachdaiche
       anon_edits_html: (%{link})
       anon_edits_link_text: Faigh a-mach carson
-      flash_player_required_html: Bidh feum agad air cluicheadair Flash gus an deasaiche
-        Flash OpenStreetMap air a bheil Potlatch a chleachdadh. 'S urrainn dhut <a
-        href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">Flash
-        Player a luchadh a-nuas o Adobe.com</a>. Tha <a href="http://wiki.openstreetmap.org/wiki/Editing">roghainnean
-        eile</a> ri làimh cuideachd gus OpenStreetMap a dheasachadh.
-      potlatch_unsaved_changes: Tha atharrachadh gun sàbhaladh agad. (airson sàbhaladh
-        ann am Potlatch, bu chòir dhut a' phuing no slighe làithreach a dhì-thaghadh
-        ma tha thu 'ga deasachadh sa mhodh bheò no briog air "Sàbhail" ma tha putan
-        sàbhalaidh agad.)
-      potlatch2_not_configured: Cha deach Potlatch 2 a rèiteachadh - tadhail air http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-        airson barrachd fiosrachaidh
-      potlatch2_unsaved_changes: Tha atharrachadh gun sàbhaladh agad. (Gus sàbhaladh
-        ann am 2, bu chòir dhut briogadh air "Sàbhail".)
       id_not_configured: Cha deach iD a rèiteachadh
       no_iframe_support: Cha toir am brabhsair agad taic ri HTML iframes a tha riatanach
         airson an fhearta seo.

config/locales/gl.yml

@@ -188,15 +188,9 @@ gl:
     with_name_html: '%{name} (%{id})'
   editor:
     default: Predeterminado (actualmente, %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (editor integrado no navegador)
     id:
       name: iD
       description: iD (editor integrado no navegador)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (editor integrado no navegador)
     remote:
       name: Control remoto
       description: Control remoto (JOSM ou Merkaartor)
@@ -1801,17 +1795,6 @@ gl:
       user_page_link: páxina de usuario
       anon_edits_html: (%{link})
       anon_edits_link_text: Descobra velaquí o motivo.
-      flash_player_required_html: Precisa un reprodutor Flash para empregar o Potlatch,
-        o editor Flash do OpenStreetMap. Pode <a href="https://get.adobe.com/flashplayer/">baixar
-        o Flash do sitio Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Tamén
-        están dispoñíbeis outras opcións</a> para editar o OpenStreetMap.
-      potlatch_unsaved_changes: Tes modificacións sen gardar. (Para gardalas no Potlatch
-        tes que deseleccionar a vía actual, o punto se está a editar no modo ao vivo
-        ou premer sobre o botón de "Gardar".)
-      potlatch2_not_configured: O Potlatch 2 non está configurado; consulte https://wiki.openstreetmap.org/wiki/The_Rails_Port
-        para obter máis información
-      potlatch2_unsaved_changes: Tes modificacións sen gardar. (Para gardar no Potlatch
-        2, preme en "Gardar".)
       id_not_configured: O iD non está configurado
       no_iframe_support: O teu navegador non soporta os iframes HTML, necesarios para
         este elemento.

config/locales/he.yml

@@ -226,15 +226,9 @@ he:
     with_name_html: '%{name} (%{id})'
   editor:
     default: ברירת מחדל (כעת %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (עורך בתוך הדפדפן)
     id:
       name: iD
       description: iD (עורך בתוך הדפדפן)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (עורך בתוך הדפדפן)
     remote:
       name: שליטה מרחוק
       description: שליטה מרחוק (JOSM או Merkaartor)
@@ -1867,16 +1861,6 @@ he:
         ייעשה. באפשרותך להגדיר את העריכות שלך כציבוריות דרך %{user_page} שלך.
       user_page_link: דף המשתמש
       anon_edits_link_text: ר' הסבר מדוע זה כך.
-      flash_player_required_html: יש צורך בנגן פלאש כדי להשתמש ב־Potlatch, ערוך הפלאש
-        של OpenStreetMap. אפשר <a href="https://get.adobe.com/flashplayer">להוריד
-        נגן פלאש מאתר Adobe.com</a>. יש <a href="https://wiki.openstreetmap.org/wiki/Editing">אפשרויות
-        נוספות</a> לעריכת OpenStreetMap.
-      potlatch_unsaved_changes: יש לך שינויים שלא נשמרו. (כדי לשמור ב־Potlatch, יש
-        לבטל את הבחירה של הדרך או הנקודה הנוכחים במצב עריכה חיה, או לשמור אם כפתור
-        השמירה זמין.)
-      potlatch2_not_configured: Potlatch 2 לא הוגדר – ר׳ https://wiki.openstreetmap.org/wiki/The_Rails_Port
-      potlatch2_unsaved_changes: יש לך שינויים שלא נשמרו. (כדי לשמור ב־Potlatch 2,
-        יש ללחוץ „שמירה”.)
       id_not_configured: לא התבצעו הגדרות של iD
       no_iframe_support: הדפדפן שלך אינו תומך באלמנטים מסוג iframe של HTML, ואלו חיוניים
         עבור תכונה זו.

config/locales/hi.yml

@@ -182,15 +182,9 @@ hi:
         other: '%{count} साल पहले'
   editor:
     default: डिफ़ॉल्ट (currently %{name})
-    potlatch:
-      name: पौटलैच 1
-      description: पॉटलैच १ (ब्राउज़र का एडिटर)
     id:
       name: आईडी
       description: iD (ब्राउज़र का एडिटर)
-    potlatch2:
-      name: पौटलैच 2
-      description: पॉटलैच २ (ब्राउज़र का एडिटर)
     remote:
       name: रिमोट कंट्रोल
       description: रिमोट कंट्रोल (JOSM या Merkaartor)
@@ -721,10 +715,6 @@ hi:
     copyright:
       legal_babble:
         contributors_title_html: हमारे योगदानकर्ता
-    edit:
-      potlatch_unsaved_changes: You have unsaved changes. (To save in Potlatch, you
-        should deselect the current way or point, if editing in list mode, or click
-        save if you have a save button.)
     export:
       area_to_export: क्षेत्र निर्यात करने के लिए
       manually_select: कृपया, आप एक अलग क्षेत्र चुनिए

config/locales/hr.yml

@@ -131,15 +131,9 @@ hr:
       half_a_minute: prije pola minute
   editor:
     default: Zadano (currently %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (editor unutar web preglednika)
     id:
       name: iD
       description: iD (uređivač u pregledniku)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (editor unutar web preglednika)
     remote:
       name: Remote Control
       description: Remote Control (JOSM ili Merkaartor)
@@ -1185,15 +1179,6 @@ hr:
         Možete namjestiti svoje promjene u javne sa %{user_page}.
       user_page_link: korisnička stranica
       anon_edits_link_text: Otkrij zašto je to slučaj.
-      flash_player_required_html: Trebate Flash player da bi koristili Potlatch, OpenStreetMap
-        uređivač izrađen u Flash-u. Možete <a href="https://get.adobe.com/flashplayer/">preuzeti
-        Abode Flash Player sa Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Neke
-        druge mogućnosti</a> su također dostupne za uređivanje OpenStreetMapa.
-      potlatch_unsaved_changes: Niste spremili promjene. (Da bi spremili u Potlatchu,
-        morate odznačiti trenutni put ili točku ako uređujete uživo; ili kliknite
-        SPREMI ako imate taj gumb.)
-      potlatch2_unsaved_changes: Neke promjene nisu spremljene. (Da biste spremili
-        u Potlatch 2, trebali bi kliknuti Spremi.)
       id_not_configured: iD nije konfiguriran
       no_iframe_support: Tvoj preglednik ne podržava HTML iframes, koji su nužni za
         ovu mogućnost.

config/locales/hsb.yml

@@ -154,15 +154,9 @@ hsb:
         other: před %{count} lětomaj
   editor:
     default: Standard (tuchwilu %{name}
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (editor za wobdźěłowanje we wobhladowaku)
     id:
       name: iD
       description: iD (we wobhladowaku zasadźeny editor)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (editor za wobdźěłowanje we wobhladowaku)
     remote:
       name: Dalokowodźenje
       description: Dalokowodźenje (JOSM abo Merkaartor)
@@ -1499,17 +1493,6 @@ hsb:
         Móžeš swoje změny na swojej %{user_page} jako zjawne markěrować.
       user_page_link: wužiwarskej stronje
       anon_edits_link_text: Zwěsćić, čehoždla je tomu tak.
-      flash_player_required_html: Trjebaš wothrawak Flash, zo by Potlatch, editor
-        OpenStreetMap Flash wužiwał. Móžeš <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">wothrawak
-        Flash wot Adobe.com sćahnyć</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Někotre
-        druhe móžnosće</a> tež za wobdźěłowanje OpenStreetMap k dispoziciji steja.
-      potlatch_unsaved_changes: Nimaš njeskładowane změny. (Zo by w programje Potlatch
-        składował, wotstroń woznamjenjenje aktualneho puća abo dypka, jeli w dynamiskim
-        modusu wobdźěłuješ, abo klikń na Składować, jeli składowanske tłóčatko eksistuje.
-      potlatch2_not_configured: Potlatch 2 hišće konfigurowany njeje - prošu hlej
-        http://wiki.openstreetmap.org/wiki/The_Rails_Port
-      potlatch2_unsaved_changes: Maš njeskładowane změny. (Zo by je w Potlatch 2 składował,
-        dyrbiš na "składować" kliknyć.)
       id_not_configured: iD njeje so konfigurował
       no_iframe_support: Twó wobhladowak njepodpěruje iframe-elementy, kotrež su za
         tutu funkciju trěbne.

config/locales/hu.yml

@@ -187,15 +187,9 @@ hu:
         other: '%{count} éve'
   editor:
     default: Alapértelmezett (jelenleg %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (böngészőn belüli szerkesztő)
     id:
       name: iD
       description: iD (böngészőben futó szerkesztő)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (böngészőn belüli szerkesztő)
     remote:
       name: Távirányító
       description: Távirányító (JOSM vagy Merkaartor)
@@ -1581,17 +1575,6 @@ hu:
         teszed meg. Nyilvánossá teheted szerkesztéseidet a %{user_page}adról.
       user_page_link: felhasználói oldal
       anon_edits_link_text: Nézz utána, miért van ez.
-      flash_player_required_html: A Potlatch, az OpenStreetMap Flash szerkesztő használatához
-        Flash Player szükséges. <a href="https://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">Letöltheted
-        a Flash Playert az Adobe.com-ról</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Számos
-        más lehetőség</a> is elérhető az OpenStreetMap szerkesztéséhez.
-      potlatch_unsaved_changes: Nem mentett módosítások vannak. (Potlatchban való
-        mentéshez szüntesd meg a jelenlegi vonal vagy pont kijelölését, ha élő módban
-        szerkesztesz, vagy kattints a mentésre, ha van mentés gomb.)
-      potlatch2_not_configured: 'A Potlatch 2 nincs beállítva – további információért
-        lásd: https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2'
-      potlatch2_unsaved_changes: Mentetlen módosításaid vannak. (A mentéshez a Potlatch
-        2-ben kattintanod kell a mentésre.)
       id_not_configured: Az iD nincs beállítva
       no_iframe_support: A böngésződ nem támogatja a HTML-kereteket, amely ehhez a
         funkcióhoz szükséges.

config/locales/ia.yml

@@ -175,15 +175,9 @@ ia:
         other: '%{count} annos retro'
   editor:
     default: Predefinite (actualmente %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (editor in navigator del web)
     id:
       name: iD
       description: iD (editor in navigator)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (editor in navigator del web)
     remote:
       name: Controlo remote
       description: Controlo remote (JOSM o Merkaartor)
@@ -1675,17 +1669,6 @@ ia:
         lo face. Tu pote configurar tu modificationes como public a partir de tu %{user_page}.
       user_page_link: pagina de usator
       anon_edits_link_text: Lege proque isto es le caso.
-      flash_player_required_html: Es necessari haber un reproductor Flash pro usar
-        Potlatch, le editor Flash de OpenStreetMap. Tu pote <a href="https://get.adobe.com/flashplayer/">discargar
-        Flash Player a Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Plure
-        altere optiones</a> es tamben disponibile pro modificar OpenStreetMap.
-      potlatch_unsaved_changes: Tu ha modificationes non salveguardate. (Pro salveguardar
-        in Potlatch, tu debe deseliger le via o puncto actual si tu modifica in modo
-        directe, o cliccar super le button Salveguardar si presente.)
-      potlatch2_not_configured: Potlatch 2 non ha essite configurate. Visita https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-        pro plus information
-      potlatch2_unsaved_changes: Tu ha modificationes non salveguardate. (In Potlatch
-        2, tu debe cliccar super Salveguardar.)
       id_not_configured: iD non ha essite configurate
       no_iframe_support: Tu navigator non supporta le iframes in HTML, necessari pro
         iste functionalitate.

config/locales/id.yml

@@ -198,15 +198,9 @@ id:
         other: '%{count} tahun yang lalu'
   editor:
     default: Standar (saat ini %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (editor di dalam browser)
     id:
       name: iD
       description: iD (editor di dalam browser internet)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (editor di dalam browser)
     remote:
       name: Pengendali Jarak Jauh
       description: Remote Control (JOSM atau Merkaartor)
@@ -1743,17 +1737,6 @@ id:
         Anda dapat mengatur editan Anda sebagai umum dari halaman %{user_page}.
       user_page_link: halaman pengguna
       anon_edits_link_text: Cari tahu mengapa hal ini terjadi.
-      flash_player_required_html: Anda membutuhkan Flash player untuk menggunakan
-        Potlatch, penyunting OpenStreetMap berbasis Flash. Anda dapat <a href="https://get.adobe.com/flashplayer/">download
-        Flash Player from Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Beberapa
-        pilihan lain</a> juga tersedia untuk menyunting OpenStreetMap.
-      potlatch_unsaved_changes: Anda memiliki perubahan yang belum disimpan. (Untuk
-        menyimpan di Potlatch, Anda harus membatalkan pilihan garis atau titik saat
-        ini, jika mengedit dalam modus live, atau klik Simpan jika Anda memiliki tombol
-        simpan.)
-      potlatch2_not_configured: Potlatch 2 belum dikonfigurasi - silakan lihat https://wiki.openstreetmap.org/wiki/The_Rails_Port
-      potlatch2_unsaved_changes: Anda memiliki perubahan yang belum disimpan. (Untuk
-        menyimpannya dengan Potlatch 2, Anda dapat klik simpan.)
       id_not_configured: iD belum dikonfigurasikan
       no_iframe_support: Peramban Anda tidak mendukung iframe HTML yang diperlukan
         untuk fitur ini.

config/locales/is.yml

@@ -184,15 +184,9 @@ is:
     with_name_html: '%{name} (%{id})'
   editor:
     default: Sjálfgefið (núna %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (ritill í vafra)
     id:
       name: iD
       description: iD (ritill í vafra)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (ritill í vafra)
     remote:
       name: RC-fjarstýring
       description: RC-fjarstýring (JOSM eða Merkaartor)
@@ -1811,17 +1805,6 @@ is:
       user_page_link: notandasíðunni þinni
       anon_edits_html: (%{link})
       anon_edits_link_text: Finndu út afhverju.
-      flash_player_required_html: Þú þarft Flash spilara til að nota Potlatch ritilinn,
-        sem er Flash-ritill fyrir OSM. Þú getur <a href="https://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">sótt
-        Flash spilara frá Adobe.com</a> eða notað <a href="https://wiki.openstreetmap.org/wiki/Editing">aðra
-        OpenStreetMap ritla</a> sem ekki krefjast Flash.
-      potlatch_unsaved_changes: Þú ert með óvistaðar breytingar. Til að vista í Potlatch
-        þarf að af-velja núverandi val ef þú ert í „Live“-ham, eða ýta á „Save“ hnappinn
-        til að vista ef sá hnappur er sjáanlegur.
-      potlatch2_not_configured: Potlatch 2 hefur ekki verið stillt - skoðaðu https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-        til að sjá nánari upplýsingar
-      potlatch2_unsaved_changes: Þú ert með óvistaðar breytingar. (Til að vista í
-        Potlatch 2 ættirðu að ýta á vistunarhnappinn.)
       id_not_configured: Það er ekki búið að setja upp auðkenni
       no_iframe_support: Því miður styður vafrinn þinn ekki HTML-iframes, sem er nauðsynlegt
         ef nota á þennan eiginleika.

config/locales/it.yml

@@ -220,18 +220,12 @@ it:
         other: '%{count} anni fa'
   editor:
     default: Predefinito (al momento %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (editor nel browser)
     id:
       name: iD
       description: iD (editor nel browser)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (editor nel browser)
     remote:
       name: Controllo remoto
-      description: Controllo remoto (JOSM o Merkaartor)
+      description: Controllo remoto (JOSM, Potlatch, Merkaartor)
   auth:
     providers:
       none: Nessuno
@@ -1862,18 +1856,6 @@ it:
         %{user_page}.
       user_page_link: pagina utente
       anon_edits_link_text: Leggi il perché.
-      flash_player_required_html: È necessario un visualizzatore Flash per utilizzare
-        Potlatch, il programma Flash per le modifiche di OpenStreetMap. Si può <a
-        href="https://get.adobe.com/flashplayer/">scaricare il Flash Player da Adobe.com</a>.
-        Sono disponibili anche <a href="https://wiki.openstreetmap.org/wiki/Editing">altre
-        possibilità</a> per apportare modifiche a OpenStreetMap.
-      potlatch_unsaved_changes: Ci sono modifiche non salvate. (Per salvare in Potlatch,
-        si dovrebbe deselezionare il percorso o nodo corrente, se si sta editando
-        nella modalità 'list', o cliccare sul bottone salva se presente.)
-      potlatch2_not_configured: Potlatch 2 non è stato configurato - vedi https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-        per ulteriori informazioni
-      potlatch2_unsaved_changes: Ci sono delle modifiche non salvate. (Per salvare
-        in Potlatch 2 è necessario premere il tasto di salvataggio.)
       id_not_configured: iD non è stato configurato
       no_iframe_support: Il proprio browser non supporta gli iframe HTML, necessari
         per questa funzionalità.

config/locales/ja.yml

@@ -219,15 +219,9 @@ ja:
     with_name_html: '%{name} (%{id})'
   editor:
     default: 既定 (現在は %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (ブラウザー内エディター)
     id:
       name: iD
       description: iD (ブラウザー内エディター)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (ブラウザー内エディター)
     remote:
       name: リモート制御
       description: 遠隔制御 (JOSM または Merkaartor)
@@ -1716,12 +1710,6 @@ ja:
       not_public_description_html: このようなことをしない限り、あなたは地図を編集できません。あなたは%{user_page}から編集内容を公開できます。
       user_page_link: ユーザーページ
       anon_edits_link_text: なぜこれれが事例なのかを見る。
-      flash_player_required_html: Flash 版 OpenStreetMap エディターである Potlatch を使用するには、Flash
-        Player が必要です。Flash Player は<a href="https://get.adobe.com/flashplayer">Adobe.com</a>
-        でダウンロードできます。OpenStreetMap を編集する<a href="https://wiki.openstreetmap.org/wiki/JA:Editing?uselang=ja">他の方法</a>もあります。
-      potlatch_unsaved_changes: 保存していない変更があります。(Potlatch では、一覧モードで編集している場合、ウェイや点の選択を解除する必要があります。または、保存ボタンをクリックして保存してください。)
-      potlatch2_not_configured: 'Potlatch 2 が設定されていません - 詳細情報はこちらをご覧ください: https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2'
-      potlatch2_unsaved_changes: 保存していない変更があります。(Potlatch 2 では、保存をクリックして保存する必要があります。)
       id_not_configured: iDが設定されていません。
       no_iframe_support: あなたのブラウザーは、この機能に必須の HTML iframe に未対応です。
     export:

config/locales/ka.yml

@@ -102,15 +102,9 @@ ka:
         tagstring: მძიმის შემდეგ
   editor:
     default: უპირობოდ (ამჟამად %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (ბრაუზერის რედაქტორი)
     id:
       name: iD
       description: iD (ბრაუზერის რედაქტორი)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (ბრაუზერის რედაქტორი)
     remote:
       name: დისტანციური მართვა
       description: დისტანციური მათვა (JOSM, ან Merkaartor)

config/locales/kab.yml

@@ -132,15 +132,9 @@ kab:
       half_a_minute: Azgen n tsedast aya
   editor:
     default: Amezwer (tura %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (amaẓrag ineṭḍen deg iminig)
     id:
       name: iD
       description: iD (yeddan deg iminig)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (amaẓrag ineṭḍen deg iminig)
     remote:
       name: Amaẓrag azɣaray
       description: Amaẓrag azɣaray (JOSM neɣ Merkaartor)

config/locales/ko.yml

@@ -183,15 +183,9 @@ ko:
       x_years: '%{count}년 전'
   editor:
     default: 기본값 (현재 %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (브라우저 내 편집기)
     id:
       name: iD
       description: iD (브라우저 내 편집기)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (브라우저 내 편집기)
     remote:
       name: 원격 제어
       description: 원격 제어 (JOSM 또는 Merkaartor)
@@ -588,7 +582,9 @@ ko:
           prison: 교도소
           pub: 술집
           public_bath: 공공 욕실
+          public_bookcase: 공공 책장
           public_building: 공공 건물
+          ranger_station: 레인저 스테이션
           recycling: 재활용장
           restaurant: 음식점
           school: 학교
@@ -615,6 +611,7 @@ ko:
           administrative: 행정 구역 경계
           census: 인구조사 구역 경계
           national_park: 국립 공원
+          political: 선거구 경계
           protected_area: 보호 구역
           "yes": 경계
         bridge:
@@ -627,37 +624,57 @@ ko:
         building:
           apartment: 아파트
           apartments: 아파트
+          barn: 외양간
+          bungalow: 방갈로
+          cabin: 오두막
+          chapel: 예배당
           church: 교회 건물
+          civic: 시민 건물
+          college: 대학 건물
           commercial: 상업용 건물
           construction: 건설 중인 건물
           dormitory: 기숙사
+          duplex: 땅콩집
           farm: 농가
           garage: 차고
           garages: 차고
           greenhouse: 온실
+          hangar: 격납고
           hospital: 병원
           hotel: 호텔 건물
           house: 주택
+          houseboat: 거주형 선박
+          hut: 소형 오두막
           industrial: 산업용 건물
+          kindergarten: 유치원 건물
+          manufacture: 생산 건물
           office: 사무실 건물
           public: 공공 건축물
+          residential: 주거 건물
           retail: 소매점 건물
           roof: 지붕
+          ruins: 폐허가 된 건물
           school: 학교 건물
           service: 서비스 건물
           terrace: 테라스 건물
           train_station: 철도역 건물
           university: 대학 건물
+          warehouse: 저장고
           "yes": 건물
         club:
           sport: 스포츠 클럽
           "yes": 클럽
         craft:
+          beekeper: 양봉장
+          blacksmith: 대장간
           brewery: 맥주 공장
           carpenter: 목공
+          caterer: 조리소
+          dressmaker: 양장점
           electrician: 전기공
           electronics_repair: 전자제품 수리점
           gardener: 정원사
+          glaziery: 유리 공장
           painter: 화가
           photographer: 사진 작가
           plumber: 배관공
@@ -1635,14 +1652,6 @@ ko:
         공개로 편집을 설정할 수 있습니다.
       user_page_link: 사용자 문서
       anon_edits_link_text: 왜 이러한지 알아보세요.
-      flash_player_required_html: OpenStreetMap 플래시 편집기인 Potlatch를 사용하려면 플래시 플레이어가
-        필요합니다. <a href="https://get.adobe.com/flashplayer">Adobe.com에서 플래시 플레이어를 다운로드</a>할
-        수 있습니다. <a href="https://wiki.openstreetmap.org/wiki/Editing">몇 가지 다른 설정</a>
-        또한 OpenStreetMap 편집을 위해 사용할 수 있습니다.
-      potlatch_unsaved_changes: 바뀐 내용을 저장하지 않았습니다. (Potlatch에 저장하려면 라이브 모드에서 편집하는
-        경우 현재 길이나 점의 선택을 해제하시고, 저장 버튼이 있다면 저장을 클릭해야 합니다.)
-      potlatch2_not_configured: Potlatch 2가 설정되지 않았습니다 - 자세한 정보는 https://wiki.openstreetmap.org/wiki/The_Rails_Port
-      potlatch2_unsaved_changes: 바뀐 내용을 저장하지 않았습니다. (Potlatch 2에서 저장하려면 저장을 클릭해야 합니다.)
       id_not_configured: iD가 설정되지 않았습니다
       no_iframe_support: 브라우저가 이 기능에 필요한 HTML iframe을 지원하지 않습니다.
     export:

config/locales/ku-Latn.yml

@@ -181,15 +181,9 @@ ku-Latn:
         other: berî %{count} salan
   editor:
     default: Standard (vêga %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (sererastkirina ji ser geroka webê)
     id:
       name: iD
       description: iD (sererastkirina ji ser geroka webê)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (sererastkirina ji ser geroka webê)
     remote:
       name: Ji Dûr Ve Îdarekirin
       description: Ji dûr ve kontrol (JOSM yan jî Merkaartor)
@@ -1846,19 +1840,6 @@ ku-Latn:
         herkesê re vekirî eyar bikî.
       user_page_link: rûpela bikarhêner
       anon_edits_link_text: Hîn bibe ku ev rewş çima wisa bûye.
-      flash_player_required_html: Ji bo ku edîtora OpenStreetMap Flashê yê bi navê
-        Potlatch bi kar bînî, ihtîyaca te bi Flash playerê heye. Tu dikarî <a href="https://get.adobe.com/flashplayer/">Flash
-        Playerê ji ser Adobe.com'ê daxînî</a>. Ji bo sererastkirina OpenStreetMapê
-        <a href="https://wiki.openstreetmap.org/wiki/Editing">gelek vebijêrkên din</a>
-        jî hene.
-      potlatch_unsaved_changes: Guherandinên te yên neqeydkirî hene. (Ji bo di Potlatchê
-        de qeyd bikî, divê gava ku guherandinê xwe di moda zindî de dikî, rê an jî
-        nuqteya ku vêga heyî bibijêrî, û heke bişkokek qeydkirinê hebe bitikînî ser
-        qeyd bike'yê.)
-      potlatch2_not_configured: Potlach 2 nehate vesazkirin - ji bo zêdetir agahiyan
-        xêra xwe binêre https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-      potlatch2_unsaved_changes: Guherandinên te yên neqeydkirî hene. (Ji bo ku di
-        Potlatch 2'ê de qeyd bikî bitikîne ser qeyd bike'yê.)
       id_not_configured: iD nehatiye mîhengkirin
       no_iframe_support: Geroka te piştgiriyê nade iframe'yên HTML ku ji bo nişandana
         vê taybetmendiyê lazim e.

config/locales/lb.yml

@@ -132,12 +132,8 @@ lb:
         other: viru(n) %{count} Joer
   editor:
     default: Standard (elo %{name})
-    potlatch:
-      name: Potlatch 1
     id:
       name: iD
-    potlatch2:
-      name: Potlatch 2
   auth:
     providers:
       none: Keng

config/locales/lt.yml

@@ -184,15 +184,9 @@ lt:
         other: prieš %{count} metus
   editor:
     default: Numatytasis (šiuo metu %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (rengyklė naršyklėje)
     id:
       name: iD
       description: iD (rengyklė naršyklėje)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (rengyklė naršyklėje)
     remote:
       name: nuotoliniu valdymu
       description: nuotolinį valdymą (JOSM arba Merkaartor)
@@ -1551,18 +1545,6 @@ lt:
         Jūs galite nustatyti keitimus, kaip viešus, iš savo %{user_page}.
       user_page_link: naudotojo puslapis
       anon_edits_link_text: Sužinokite, kodėl taip yra.
-      flash_player_required_html: Norint redaguoti su Potlatch, OpenStreetMap Flash
-        rengykle, jums reikia Flash player. Jūs galite <a href="https://get.adobe.com/flashplayer/">parsisiųsti
-        Flash Player iš Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Taip
-        pat yra daugybė kitų būdų</a>, kuriais galėsite prisidėti prie OpenStreetMap
-        žemėlapio redagavimo.
-      potlatch_unsaved_changes: Turite neįrašytų keitimų. Norint įrašyti keitimą Potlatch'e,
-        jūs turite nuimti pažymėtus taškus ir kelius jei redaguojate gyvai (live mode)
-        ar tiesiog tiesiog paspauskite mygtuką 'įrašyti'.
-      potlatch2_not_configured: Potlatch 2 nesukonfigūruotas - daugiau informacijos
-        rasite https://wiki.openstreetmap.org/wiki/The_Rails_Port
-      potlatch2_unsaved_changes: Yra neįrašytų pakeitimų. (Norėdami įrašyti Potlatch
-        2, turėtumėte spustelėti įrašyti.)
       id_not_configured: iD nesukonfigūruotas
       no_iframe_support: Jūsų naršyklė nepalaiko HTML iframe'ų, o šiai savybei jie
         būtini.

config/locales/lv.yml

@@ -129,15 +129,9 @@ lv:
         tagstring: atdalīts ar komatiem
   editor:
     default: Noklusējuma (pašlaik %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (atvērt pārlūkā)
     id:
       name: iD
       description: iD (pārlūka redaktors)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (atvērt pārlūkā)
     remote:
       name: Attālinātā palaišana
       description: Attālinātā palaišana  (JOSM vai Merkaartor)
@@ -1378,17 +1372,6 @@ lv:
         Tu vari uzstādīt savus labojumus kā publiskus no savas %{user_page}s.
       user_page_link: dalībnieka lapa
       anon_edits_link_text: Uzzini, kāpēc tā notiek.
-      flash_player_required_html: Jums nepieciešams Flash playeris lai izmantotu Potlatch
-        - OpenStreetMap Flash redaktoru. Jūs varat <a href="https://get.adobe.com/flashplayer/">Lejupielādēt
-        Flash Player no Adobe.com</a>.  OpenStreetMap rediģēšanai ir pieejamas arī<a
-        href="https://wiki.openstreetmap.org/wiki/Editing">vairākas citas iespējas</a>
-        .
-      potlatch_unsaved_changes: Tev ir nesaglabātas izmaiņas. (Lai saglabātu iekš
-        Potlatch, tev ir jānoņem atlase no esošā ceļa vai punkta, ja labojiet tiešraides
-        režīmā, vai spiediet saglabāt, ja Jums ir Saglabāt poga.)
-      potlatch2_not_configured: Potlatch 2 nav konfigurēts - lūdzu apskati http://wiki.openstreetmap.org/wiki/The_Rails_Port
-      potlatch2_unsaved_changes: Tev ir nesaglabātas izmaiņas. (Lai saglabātu iekš
-        Potlach 2, tev ir jāspiež saglabāt.)
       id_not_configured: iD nav konfigurēts
       no_iframe_support: Tavs pārlūks neatbalsta HTML rāmjus, kas ir nepieciešami
         šai iezīmei.

config/locales/mk.yml

@@ -180,15 +180,9 @@ mk:
     with_name_html: '%{name} (%{id})'
   editor:
     default: По основно (моментално %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (уредник во прелистувач)
     id:
       name: iD
       description: iD (прелистувачки програм за уредување)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (уредник во прелистувач)
     remote:
       name: Далечинско управување
       description: Далечинско управување (JOSM или Merkaartor)
@@ -1844,17 +1838,6 @@ mk:
       user_page_link: корисничка страница
       anon_edits_html: (%{link})
       anon_edits_link_text: Дознајте зошто ова е така.
-      flash_player_required_html: Ќе ви треба Flash-програм за да го користите Potlatch
-        — Flash-уредник за OpenStreetMap. Можете да <a href="https://get.adobe.com/flashplayer/">го
-        преземете Flash Player од Adobe.com</a>. Имате и <a href="https://wiki.openstreetmap.org/wiki/Editing">неколку
-        други можности</a> за уредување на OpenStreetMap.
-      potlatch_unsaved_changes: Имате незачувани промени. (За да зачувате во Potlatch,
-        треба го одселектирате тековниот пат или точка, ако уредувате во живо, или
-        стиснете на „зачувај“ ако го имате тоа копче.)
-      potlatch2_not_configured: Potlatch 2 не е поставен — погледајте ја страницата
-        https://wiki.openstreetmap.org/wiki/The_Rails_Port
-      potlatch2_unsaved_changes: Имате незачувани промени. (Зачувувањето во Potlatch
-        2 се врши со стискање на „зачувај“.)
       id_not_configured: Не му се зададени поставки на уредувачкиот програм „iD“
       no_iframe_support: Вашиот прелистувач не поддржува „иРамки“ (iframes) со HTML,
         без кои оваа можност не може да работи.

config/locales/mr.yml

@@ -100,15 +100,9 @@ mr:
         tagstring: स्वल्पविरामाने परिसीमित
   editor:
     default: सामान्यतः (सध्या %{name})
-    potlatch:
-      name: पॉटलॅच १
-      description: पॉटलॅच १ (न्याहाळकात चालणारा संपादक)
     id:
       name: iD
       description: iD (न्याहाळकात चालणारा संपादक)
-    potlatch2:
-      name: पॉटलॅच २
-      description: पॉटलॅच २ (न्याहाळकात चालणारा संपादक)
     remote:
       name: सुदूर नियंत्रण
       description: सुदूर नियंत्रण (JOSM अथवा Merkaartor)

config/locales/ms.yml

@@ -143,15 +143,9 @@ ms:
       x_years: '%{count} tahun yang lalu'
   editor:
     default: Asali (kini %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (alat sunting dalam pelayar)
     id:
       name: iD
       description: iD (editor dalam pelayar)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (alat sunting dalam pelayar)
     remote:
       name: Kawalan Jauh
       description: Kawalan Jauh (JOSM atau Merkaartor)
@@ -1400,16 +1394,6 @@ ms:
         tatapan umum di %{user_page} anda.
       user_page_link: laman pengguna
       anon_edits_link_text: Ketahuilah sebab jadinya begini.
-      flash_player_required_html: Anda memerlukan pemain Flash untuk menggunakan Potlatch,
-        iaitu editor OpenStreetMap yang menggunakan Flash. Anda boleh <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">memuat
-        turun Flash Player dari Adobe.com</a>. Terdapat juga <a href="http://wiki.openstreetmap.org/wiki/Editing">pilihan-pilihan
-        lain</a> untuk menyunting OpenStreetMap.
-      potlatch_unsaved_changes: Anda ada perubahan yang belum disimpan. (Untuk menyimpan
-        dalam Potlatch, anda perlu menyahpilih arah atau titik semasa jika anda menyunting
-        dalam mod langsung, atau klik simpan jika terdapat butang simpan.)
-      potlatch2_not_configured: Potlatch 2 belum dikonfigurasikan - sila lihat http://wiki.openstreetmap.org/wiki/The_Rails_Port
-      potlatch2_unsaved_changes: Anda ada perubahan yang belum disimpan. (Untuk menyimpan
-        dalam Potlatch 2, anda patut mengklik 'simpan'.)
       id_not_configured: iD belum dikonfigurasi
       no_iframe_support: Pelayar web anda tidak menyokong 'iframe' HTML yang diperlukan
         untuk ciri ini.

config/locales/nb.yml

@@ -182,15 +182,9 @@ nb:
         other: '%{count} år siden'
   editor:
     default: Standard (nåværende %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (redigering i nettleseren)
     id:
       name: iD
       description: iD (redigering i nettleseren)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (redigering i nettleseren)
     remote:
       name: Lokalt installert program
       description: Lokalt installert program (JOSM eller Merkaartor)
@@ -1570,17 +1564,6 @@ nb:
         det. Du kan gjøre dine redigeringer offentlige fra din %{user_page}.
       user_page_link: brukerside
       anon_edits_link_text: Finn ut hvorfor dette er tilfellet.
-      flash_player_required_html: Du trenger en Flash-spiller for å kunne bruke Potlatch
-        som er Flasheditoren for OpenStreetMap. Du kan <a href="https://get.adobe.com/flashplayer">laste
-        ned Flash Player fra Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Det
-        finnes flere alternativer</a> for å redigere OpenStreetMap.
-      potlatch_unsaved_changes: Du har ulagrede endringer. (For å lagre i Potlatch,
-        må du fjerne markeringen av gjeldende vei eller punkt hvis du redigerer i
-        live-modues eller klikke lagre hvis du har en lagreknapp.)
-      potlatch2_not_configured: Potlatch 2 har ikke blitt konfigurert - se https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-        for mer informasjon
-      potlatch2_unsaved_changes: Du har endringer som ikke er lagret. (For å lagre
-        i Potlatch 2, må du klikke lagre.)
       id_not_configured: iD er ikke satt opp
       no_iframe_support: Nettleseren din støtter ikke HTML iframes som er nødvendig
         for denne egenskapen.

config/locales/ne.yml

@@ -116,15 +116,9 @@ ne:
     with_name_html: '%{name} (%{id})'
   editor:
     default: पूर्वस्थापित(अहिलेको %{name})
-    potlatch:
-      name: पोटल्याच १
-      description: पोटल्याच १ (ब्राउजर सम्पादन)
     id:
       name: iD
       description: iD (ब्राउजर सम्पादक)
-    potlatch2:
-      name: पोटल्याच २
-      description: पोटल्याच २ (ब्राउजर सम्पादन)
     remote:
       name: रिमोट कन्ट्रोल
       description: रिमोट कन्ट्रोल  (JOSM वा Merkaartor)

config/locales/nl.yml

@@ -213,15 +213,9 @@ nl:
         other: '%{count} jaar geleden'
   editor:
     default: Standaard (op dit moment %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (bewerken in de browser)
     id:
       name: iD
       description: iD (bewerken in de browser)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (bewerken in de browser)
     remote:
       name: Afstandsbediening
       description: Afstandsbediening (JOSM of Merkaartor)
@@ -1633,17 +1627,6 @@ nl:
         u uw bewerkingen openbaar maakt. U kunt deze instelling maken op uw %{user_page}.
       user_page_link: gebruikerspagina
       anon_edits_link_text: Lees waarom dit het geval is.
-      flash_player_required_html: U hebt Flash-player nodig om Potlatch, de OpenStreetMap
-        Flash-editor te gebruiken. U kunt <a href="https://get.adobe.com/flashplayer/">Flash-player
-        van Adobe.com downloaden</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Er
-        zijn ook andere opties</a> om OpenStreetMap te bewerken.
-      potlatch_unsaved_changes: U hebt wijzigingen gemaakt die nog niet zijn opgeslagen.
-        Om op te slaan in Potlach, deselecteert u de huidige weg of het huidige punt
-        als u in livemodus bewerkt, of klikt u op de knop Opslaan.
-      potlatch2_not_configured: Potlatch 2 is niet ingesteld – zie https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-        voor meer informatie
-      potlatch2_unsaved_changes: U hebt wijzigingen die nog niet zijn opgeslagen.
-        Om op te slaan in Potlatch 2 moet u op "Opslaan" klikken.
       id_not_configured: iD is niet ingesteld
       no_iframe_support: Uw browser ondersteunt geen iframes HTML die nodig zijn voor
         deze functie.

config/locales/nn.yml

@@ -171,15 +171,9 @@ nn:
     with_version: '%{id}, v%{version}'
   editor:
     default: Standard (noverande %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (rediger i nettlesaren)
     id:
       name: iD
       description: iD (i nettlesaren)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (i nettlesaren)
     remote:
       name: lokalt installert program
       description: Lokalt installert program (JOSM eller Merkaartor)
@@ -1274,16 +1268,6 @@ nn:
       user_page_link: brukarside
       anon_edits_html: (%{link})
       anon_edits_link_text: Finn ut kvifor dette er tilfellet.
-      flash_player_required_html: Du treng ein Flash-spelar for å kunne bruke Potlatch,
-        Flasheditoren for OpenStreetMap. Du kan <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_prod_version=ShockwaveFlash">laste
-        ned Flash Player frå Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Fleire
-        andre alternativ</a> er òg tilgjengeleg for redigering av OpenStreetMap.
-      potlatch_unsaved_changes: Du har ulagra endringar. (For å lagre i Potlatch,
-        må du fjerne markeringa av gjeldande veg eller punkt viss du redigerer i live-modues
-        eller klikke lagre viss du har ein lagreknapp.)
-      potlatch2_not_configured: Potlatch 2 har ikkje vorte konfigurert - sjå http://wiki.openstreetmap.org/wiki/The_rails_port
-      potlatch2_unsaved_changes: Du har endringar som ikkje er lagra. (For å lagre
-        i Potlatch 2, må du klikke lagre.)
       id_not_configured: iD er ikkje konfigurert
       no_iframe_support: Nettlesaren din støttar ikkje HTML iframes som er naudsynt
         for denne eigenskapen.

config/locales/oc.yml

@@ -163,15 +163,9 @@ oc:
         other: fa près de %{count} d'ans
   editor:
     default: Per defaut (actualament %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (editor integrat au navigador)
     id:
       name: iD
       description: iD (editor integrat al navigador)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (editor integrat au navigador)
     remote:
       name: Editor extèrne
       description: Editor extèrne (JOSM o Merkaartor)
@@ -1501,8 +1495,6 @@ oc:
       not_public: Avètz pas reglat vòstras modificacions per que sián publicas.
       user_page_link: pagina d'utilizaire
       anon_edits_link_text: Trobatz perqué aicí.
-      potlatch2_unsaved_changes: Avètz de modificacions pas salvadas. (Per salvar
-        vòstras modificacions dins Potlach2, clicar sus "enregistrar".)
       id_not_configured: iD es pas estat configurat
     export:
       title: Exportar

config/locales/pl.yml

@@ -253,15 +253,9 @@ pl:
     with_name_html: '%{name}(%{id})'
   editor:
     default: edytorze domyślnym (obecnie %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (w przeglądarce)
     id:
       name: iD
       description: iD (w tej przeglądarce)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (w tej przeglądarce)
     remote:
       name: Zewnętrzny edytor
       description: zewnętrznym edytorze (JOSM lub Merkaartor)
@@ -1918,17 +1912,6 @@ pl:
       user_page_link: stronie użytkownika
       anon_edits_html: (%{link})
       anon_edits_link_text: Tu dowiesz się dlaczego.
-      flash_player_required_html: Aby korzystać z Potlatcha, edytora OpenStreetMap,
-        niezbędna jest wtyczka Flash. Możesz <a href="https://get.adobe.com/flashplayer/">ściągnąć
-        odtwarzacz Flash</a> z Adobe.com.  Możesz również skorzystać z <a href="https://wiki.openstreetmap.org/wiki/Pl:Edytowanie">innych
-        dostępnych edytorów</a>, aby edytować OpenStreetMap.
-      potlatch_unsaved_changes: Masz niezapisane zmiany. (Aby zapisać zmiany w Potlatchu,
-        kliknij przycisk „Zapisz” bądź też, jeśli edytujesz w trybie „na żywo”, odznacz
-        aktualnie zaznaczony obiekt.)
-      potlatch2_not_configured: Potlatch 2 nie został skonfigurowany – aby uzyskać
-        więcej informacji, zobacz https://wiki.openstreetmap.org/wiki/The_Rails_Port
-      potlatch2_unsaved_changes: Nie zapisałeś zmian. (Jeśli chcesz zapisać zmiany
-        w Potlatch 2 powinieneś kliknąć przycisk „zapisz”.)
       id_not_configured: iD nie został skonfigurowany
       no_iframe_support: Używana przeglądarka nie obsługuje HTML iframes, które są
         niezbędne dla tej funkcji.

config/locales/pt-BR.yml

@@ -221,15 +221,9 @@ pt-BR:
     with_name_html: '%{name} (%{id})'
   editor:
     default: Padrão (atualmente %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (editor no navegador)
     id:
       name: iD
       description: iD (editor no navegador web)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (editor no navegador web)
     remote:
       name: Controle Rrmoto
       description: Controle remoto (JOSM ou Merkaartor)
@@ -1887,17 +1881,6 @@ pt-BR:
       user_page_link: página de usuário
       anon_edits_html: (%{link})
       anon_edits_link_text: Descubra se é esse o seu caso.
-      flash_player_required_html: Necessita do Flash instalado e ativado para usar
-        o Potlatch, o editor em Flash do OpenStreetMap. Pode <a href="https://get.adobe.com/flashplayer/">descarregar
-        o Flash do sítio Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Também
-        estão disponíveis outras opções</a> para editar o OpenStreetMap.
-      potlatch_unsaved_changes: Você tem alterações não salvas. (Para salvar no Potlatch,
-        você deve deselecionar a linha ou ponto atual se estiver editando ao vivo,
-        ou clicar em salvar se estiver editando offline.
-      potlatch2_not_configured: O Potlatch 2 não foi configurado - por favor veja
-        https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 para mais informações
-      potlatch2_unsaved_changes: Você tem alterações não salvas. (Para salvar no Potlatch
-        2, você deve clicar em Salvar.)
       id_not_configured: iD não foi configurado
       no_iframe_support: Seu navegador não suporta iframes HTML, que são necessários
         para esse recurso.

config/locales/pt-PT.yml

@@ -206,15 +206,9 @@ pt-PT:
         other: há %{count} anos
   editor:
     default: Padrão (atualmente %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (editor no navegador)
     id:
       name: iD
       description: iD (editor no navegador)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (editor no navegador)
     remote:
       name: Controlo Remoto
       description: Controlo Remoto (JOSM ou Merkaartor)
@@ -1804,17 +1798,6 @@ pt-PT:
       user_page_link: página de utilizador
       anon_edits_html: (%{link})
       anon_edits_link_text: Descobre a que se deve isto.
-      flash_player_required_html: Precisas do Flash Player instalado e ativado para
-        usar o Potlatch, o editor Flash do OpenStreetMap. Podes <a href="https://get.adobe.com/flashplayer/">transferir
-        o Flash do sítio Adobe.com</a>.<br><a href="https://wiki.openstreetmap.org/wiki/Editing">Também
-        há outras opções disponíveis</a> para editares o OpenStreetMap.
-      potlatch_unsaved_changes: Tens alterações por gravar. (Para gravar no Potlatch,
-        deves desmarcar o ponto ou linha atual, se estiveres a editar no modo direto,
-        ou clicar no botão gravar se este estiver disponível.)
-      potlatch2_not_configured: O Potlatch 2 não foi configurado - por favor, consulta
-        https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2 para mais informações
-      potlatch2_unsaved_changes: Tens alterações que não foram gravadas. (Para gravar
-        no Potlatch 2, deves clicar no botão Gravar.)
       id_not_configured: O editor iD não foi configurado
       no_iframe_support: O teu navegador de Internet não suporta iframes HTML, que
         são necessárias para esta funcionalidade.

config/locales/ro.yml

@@ -186,15 +186,9 @@ ro:
     with_name_html: '%{name} (%{id})'
   editor:
     default: Implicit (în prezent %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (editor înglobat în navigator)
     id:
       name: iD
       description: iD (editor înglobat în navigator)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (editor înglobat în navigator)
     remote:
       name: Control la distanță
       description: Control de la distanță (JOSM sau Merkaartor)
@@ -1687,18 +1681,6 @@ ro:
         lucru. Puteți să vă setați editările ca public din %{user_page}.
       user_page_link: pagină de utilizator
       anon_edits_link_text: Aflați de ce este cazul.
-      flash_player_required_html: Aveți nevoie de un player Flash pentru a utiliza
-        Potlatch, editorul OpenStreetMap Flash. Puteți <a href="https://get.adobe.com/flashplayer/">descarcă
-        Flash Player de la Adobe.com</a> descărca Flash Player de la Adobe.com </a>.
-        <a href="https://wiki.openstreetmap.org/wiki/Editing">Sunt disponibile </a>
-        Sunt disponibile și câteva alte opțiuni pentru editarea OpenStreetMap.
-      potlatch_unsaved_changes: Aveți modificări nesalvate. (Pentru a salva în Potlatch,
-        ar trebui să deselectați calea sau punctul curent, dacă editați în modul live
-        sau faceți clic pe Salvați dacă aveți un buton de salvare.)
-      potlatch2_not_configured: Potlatch 2 nu a fost configurat - consultați https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-        pentru mai multe informații
-      potlatch2_unsaved_changes: Aveți modificări nesalvate. (Pentru a salva în Potlatch
-        2, ar trebui să faceți clic pe salvare.)
       id_not_configured: iD nu a fost configurat
       no_iframe_support: Browserul dvs. nu acceptă iframe HTML care sunt necesare
         pentru această caracteristică.

config/locales/ru.yml

@@ -267,15 +267,9 @@ ru:
         other: '%{count} лет назад'
   editor:
     default: По умолчанию (назначен %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (редактор в браузере)
     id:
       name: iD
       description: iD (редактор в браузере)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (редактор в браузере)
     remote:
       name: Дистанционное управление
       description: Дистанционное управление (JOSM или Merkaartor)
@@ -1725,17 +1719,6 @@ ru:
       user_page_link: страница пользователя
       anon_edits_html: '%{link}'
       anon_edits_link_text: Выяснить, в чём дело.
-      flash_player_required_html: Для использования редактора Potlatch необходим Flash-плеер.
-        Вы можете <a href="https://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">загрузить
-        Flash-плеер с Adobe.com</a>. Существуют и <a href="https://wiki.openstreetmap.org/index.php?title=RU:Editing&uselang=ru">другие
-        способы</a> редактирования OpenStreetMap.
-      potlatch_unsaved_changes: Имеются несохранённые изменения. (Для сохранения в
-        Potlatch снимите выделение с пути или точки, если редактируете в «живом» режиме,
-        либо нажмите кнопку «сохранить», если вы в режиме отложенного сохранения.)
-      potlatch2_not_configured: Potlatch 2 не был настроен — пожалуйста, обратитесь
-        к https://wiki.openstreetmap.org/wiki/The_Rails_Port за дополнительной информацией
-      potlatch2_unsaved_changes: Имеются несохранённые изменения. (Для сохранения
-        в Potlatch 2 следует нажать «Сохранить».)
       id_not_configured: iD не был настроен
       no_iframe_support: Ваш браузер не поддерживает рамки в HTML, а они нужны для
         этого режима.

config/locales/sc.yml

@@ -106,9 +106,6 @@ sc:
 
         iD
       description: iD (acontzadore in lìnia)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (acontzadore in lìnia)
     remote:
       name: Controllu Remotu
       description: Controllu Remotu (JOSM o Merkaartor)

config/locales/scn.yml

@@ -111,15 +111,9 @@ scn:
         tagstring: spartuti câ vìrgula
   editor:
     default: Pridifinutu (com'a ora %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (editor ntô browser)
     id:
       name: iD
       description: iD (editor ntô browser)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (editor ntô browser)
     remote:
       name: Telecumannu
       description: Telecumannu (JOSM o Merkaartor)
@@ -1271,17 +1265,6 @@ scn:
         nun lu fai. Poi mpustari li tò canciamenti comu pùbblici dâ tò %{user_page}.
       user_page_link: pàggina di l'utenti
       anon_edits_link_text: Ti spigamu pirchì.
-      flash_player_required_html: T'abbisogna lu Flash player p'adupirari Potlatch,
-        lu prugramma pi canciari OpenStreetMap fattu cû Flash. Poi <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">scarricari
-        lu Flash Player d'Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Ci
-        sunnu macari àutri altirnativi</a> pi fari canciamenti nta OpenStreetMap.
-      potlatch_unsaved_changes: Hai canciamenti nun sarvati. (Pi sarvari nta Potlatch,
-        avissi a disilizziunari lu caminu o lu puntu currenti, si stai facennu canciamenti
-        ntâ mudalità diretta, o si l'hai, carcari lu buttuni «sarva».)
-      potlatch2_not_configured: Potlatch 2 fu cunfiguratu - pi favuri talìa http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-        p'aviri nfurmazzioni
-      potlatch2_unsaved_changes: Hai canciamenti nun sarvati. (Pi sarvari nta Potlach
-        2, hai a carcari «sarva».)
       id_not_configured: iD nun fu cunfiguratu
       no_iframe_support: Lu tò browser nun supporta l'iframe di l'HTML, chi sunnu
         nicissarî pi sta funziunalità.

config/locales/sco.yml

@@ -84,15 +84,9 @@ sco:
         pass_crypt: Passwird
   editor:
     default: Default (currently %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (in-brouser eeditor)
     id:
       name: iD
       description: iD (in-brouser eeditor)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (in-brouser eeditor)
     remote:
       name: Remote Control
       description: Remote Control (JOSM or Merkaartor)

config/locales/sk.yml

@@ -138,15 +138,9 @@ sk:
       half_a_minute: pred pol minútou
   editor:
     default: Predvolený (v súčasnosti %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (editor v prehliadači)
     id:
       name: iD
       description: iD (editor v prehliadači)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (editor v prehliadači)
     remote:
       name: Diaľkové ovládanie
       description: Diaľkové ovládanie (JOSM alebo Merkaartor)
@@ -1306,17 +1300,6 @@ sk:
         Svoje úpravy môžete nastaviť ako verejné na vašej %{user_page}.
       user_page_link: stránke používateľa
       anon_edits_link_text: Prečo to tak je?
-      flash_player_required_html: Ak chcete používať Potlatch, flashový editor OpenStreetMap,
-        potrebujete Flash prehrávač. Môžete si <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">stiahnuť
-        Flash Player z Adobe.com</a>. Pre editáciu OpenStreetMap existuje <a href="http://wiki.openstreetmap.org/wiki/Editing">viacero
-        ďalších možností</a>.
-      potlatch_unsaved_changes: Nemáte uložené zmeny. (V Potlatchu odznačte aktuálnu
-        cestu alebo bod ak editujete v živom režime, alebo kliknite na tlačítko Uložiť
-        (Save) vľavo hore, ak sa tam zobrazuje.)
-      potlatch2_not_configured: Potlatch 2 nie je nakonfigurovaný – podrobnejšie informácie
-        nájdete na http://wiki.openstreetmap.org/wiki/The_Rails_Port
-      potlatch2_unsaved_changes: Nemáte uložené zmeny. (V Potlatch 2 sa zmeny ukladajú
-        kliknutím na tlačítko Save/Uložiť vľavo hore.)
       id_not_configured: iD zatiaľ nie je nakonfigurovaný
       no_iframe_support: Váš prehliadač nepodporuje vložené HTML rámy (iframes), ktoré
         sú pre túto funkciu nevyhnutné.

config/locales/sl.yml

@@ -138,15 +138,9 @@ sl:
     with_version: '%{id}, %{version}. različica'
   editor:
     default: Privzet (trenutno %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (v brskalniku)
     id:
       name: iD
       description: iD (urejevalnik v brskalniku)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (urejevalnik v brskalniku)
     remote:
       name: Zunanji urejevalnik
       description: Zunanji urejevalnik (JOSM ali Merkaartor)
@@ -1331,16 +1325,6 @@ sl:
         niso javni. Označite jih lahko kot javne na %{user_page}.
       user_page_link: strani vašega uporabniškega računa
       anon_edits_link_text: Pojasnilo zakaj je temu tako.
-      flash_player_required_html: Za uporabo Potlatcha, urejevalnika OpenStreetMap,
-        potrebujete predvajalnik Flash. Prenesete ga lahko s strani <a href="https://get.adobe.com/flashplayer/">Adobe.com</a>.
-        Na razpolago so tudi <a href="https://wiki.openstreetmap.org/wiki/Editing">druge
-        možnosti</a> za urejanje zemljevidov OpenStreetMap.
-      potlatch_unsaved_changes: Imate neshranjene spremembe. (Za shranjevanje v Potlatch-u,
-        od-izberite trenutno pot ali vozlišče (v načinu v živo), ali pa kliknite na
-        gumb Save (shrani), če ga imate.)
-      potlatch2_not_configured: Potlatch 2 ni nastavljen - poglej https://wiki.openstreetmap.org/wiki/The_Rails_Port
-      potlatch2_unsaved_changes: Spremembe niso shranjene. (Če želite shraniti v Potlatch
-        2, kliknete Shrani.)
       id_not_configured: iD še ni bil konfiguriran
       no_iframe_support: Vaš brskalnik ne podpira HTML iframes, kar je potrebno za
         to funkcijo.

config/locales/sq.yml

@@ -115,15 +115,9 @@ sq:
     with_version: '%{id}, v%{version}'
   editor:
     default: E parazgjedhur (aktualisht %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (redaktorin e shfletuesit)
     id:
       name: iD
       description: iD (në redaktorin e shfletuesit)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (në redaktorin e shfletuesit)
     remote:
       name: Kontrollë nga larg
       description: Kontrollë nga larg (JOSM apo Merkaartor)
@@ -1092,10 +1086,6 @@ sq:
     edit:
       user_page_link: '{{GENDER:{{ROOTPAGENAME}}|faqja e përdoruesit|faqja e përdorueses}}'
       anon_edits_html: (%{link})
-      flash_player_required_html: Ti duhet të kesh 'Flash Player' për ta përdorur
-        'Potlatch', redaktorin e 'OpenStreetMap Flash'. Ti mund ta shkarkosh <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">Flash
-        Player nga Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Disa
-        mënyra të tjera</a>të për ta redaktuar OpenStreetMap, gjithashtu janë të mundshme.
     export:
       title: Eksporto
       area_to_export: Zona për tu eksportuar

config/locales/sr-Latn.yml

@@ -114,12 +114,6 @@ sr-Latn:
     with_version: '%{id}, ver. %{version}'
   editor:
     default: Podrazumevano (trenutno %{name})
-    potlatch:
-      name: Potlač 1
-      description: Potlač 1 (uređivač u pregledaču)
-    potlatch2:
-      name: Potlač 2
-      description: Potlač 2 (uređivač u pregledaču)
     remote:
       name: Daljinsko upravljanje
       description: Daljinsko upravljanje (JOSM ili Merkaartor)
@@ -968,15 +962,6 @@ sr-Latn:
       user_page_link: korisničke stranice
       anon_edits_html: (%{link})
       anon_edits_link_text: Saznajte zašto je to slučaj.
-      flash_player_required_html: Potreban vam je fleš plejer da biste koristili uređivač
-        mapa. Preuzmite ga <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">odavde</a>.
-        Dostupne su i <a href="http://wiki.openstreetmap.org/wiki/Editing">neke druge
-        mogućnosti</a> za uređivanje Openstritmapa.
-      potlatch_unsaved_changes: Niste sačuvali izmene. Da biste to uradili, poništite
-        tekuću putanju ili tačku, ako uređujete naživo, ili kliknite na dugme za čuvanje.
-      potlatch2_not_configured: Potlač 2 nije podešen. Pogledajte http://wiki.openstreetmap.org/wiki/The_Rails_Port
-      potlatch2_unsaved_changes: Niste sačuvali izmene. Da biste to uradili, kliknite
-        na dugme za čuvanje.
       no_iframe_support: Vaš pregledač ne podržava HTML iframes, a oni su potrebni
         za ovu mogućnost.
     export:

config/locales/sr.yml

@@ -144,15 +144,9 @@ sr:
     with_version: '%{id}, вер. %{version}'
   editor:
     default: Подразумевано (тренутно %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (уређивач у прегледачу)
     id:
       name: iD
       description: iD (уређивач у прегледачу)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (уређивач у прегледачу)
     remote:
       name: Даљинско управљање
       description: Даљинско управљање (JOSM или Merkaartor)
@@ -1463,17 +1457,6 @@ sr:
       user_page_link: корисничке странице
       anon_edits_html: (%{link})
       anon_edits_link_text: Сазнајте зашто је то случај.
-      flash_player_required_html: Потребан вам је Flash Player да бисте користили
-        Potlatch, OpenStreetMap Flash уређивач. Можете да <a href="https://get.adobe.com/flashplayer/">преузмете
-        Flash Player са веб-сајта Adobe.com</a>. <a href="https://wiki.openstreetmap.org/wiki/Editing">Неколико
-        других опција</a> су такође доступне за уређивање OpenStreetMap-а.
-      potlatch_unsaved_changes: Имате несачуване измене. (Да бисте их сачували у Potlatch-у,
-        демаркирајте тренутни пут или тачку, ако уређујете у „живом“ режиму, или кликните
-        на дугме за чување, ако постоји.)
-      potlatch2_not_configured: Потлач 2 није конфигурисан — погледајте https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-        за више информација
-      potlatch2_unsaved_changes: Нисте сачували измене. Да бисте то урадили, кликните
-        на дугме за чување.
       id_not_configured: iD није конфигурисан
       no_iframe_support: Ваш прегледач не подржава HTML iframes, а они су потребни
         за ову могућност.

config/locales/sv.yml

@@ -219,15 +219,9 @@ sv:
     with_name_html: '%{name} (%{id})'
   editor:
     default: Standard (för närvarande %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (webbläsarredigerare)
     id:
       name: iD
       description: iD (webbläsarredigeraren)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (webbläsarredigerare)
     remote:
       name: Fjärrstyrning
       description: Fjärrstyrning (JOSM eller Merkaartor)
@@ -1754,16 +1748,6 @@ sv:
       user_page_link: användarsida
       anon_edits_html: (%{link})
       anon_edits_link_text: Ta reda på varför det är så.
-      flash_player_required_html: Du måste ha Flash Player för att kunna använda Potlatch,
-        OpenStreetMaps flasheditor. Du kan <a href="https://get.adobe.com/flashplayer">ladda
-        hem Flash Player från Adobe.com</a>. Det finns också <a href="https://wiki.openstreetmap.org/wiki/Editing">flera
-        andra redigerare</a> tillgängliga för OpenStreetMap.
-      potlatch_unsaved_changes: Du har osparade ändringar. (För att spara i Potlatch,
-        bör du avmarkera den nuvarande vägen eller markeringen om du redigerar i realtidsläge,
-        eller klicka på Spara om du har en Spara-knapp.)
-      potlatch2_not_configured: Potlatch 2 har inte konfigurerats - se https://wiki.openstreetmap.org/wiki/The_Rails_Port
-      potlatch2_unsaved_changes: Du har osparade ändringar. (För att spara i Potlatch
-        2, bör du klicka på spara.)
       id_not_configured: iD har inte konfigurerats
       no_iframe_support: Din webbläsare stöder inte HTML iframes, vilken är nödvändig
         för den här funktionen.

config/locales/ta.yml

@@ -107,12 +107,6 @@ ta:
         tagstring: காற்புள்ளி வரம்பில்லை
   editor:
     default: இயல்புநிலை (தற்போதைய %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (உலவியினுள்ளேயே அமைந்த தொகுப்பி)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (உலவியினுள்ளேயே அமைந்த தொகுப்பி)
     remote:
       name: தொலைவுக் கட்டுப்பாடு
       description: தொலைவு கட்டுப்பாடு (JOSM அல்லது Merkaartor)

config/locales/th.yml

@@ -172,15 +172,9 @@ th:
       x_years: '%{count} ปีก่อน'
   editor:
     default: ค่าปกติ (ขณะนี้ %{name})
-    potlatch:
-      name: พอตแลตช์ 1
-      description: พอตแลตช์ 1 (ตัวแก้ไขในเบราว์เซอร์)
     id:
       name: iD
       description: iD (ตัวแก้ไขในเบราว์เซอร์)
-    potlatch2:
-      name: พอตแลตช์ 2
-      description: พอตแลตช์ 2 (ตัวแก้ไขในเบราว์เซอร์)
     remote:
       name: การควบคุมระยะไกล
       description: ตัวควบคุมระยะไกล (JOSM หรือ Merkaartor)
@@ -1538,16 +1532,6 @@ th:
         ท่านสามารถตั้งให้การแก้ไขของท่านมองเห็นได้ทั่วไปที่%{user_page}
       user_page_link: หน้าผู้ใช้
       anon_edits_link_text: ค้นหาว่าทำไมจึงเป็นเช่นนี้
-      flash_player_required_html: คุณต้องมี Flash Player เพื่อใช้ Potlatch ตัวแก้ไข
-        OpenStreetMap Flash คุณสามารถ<a href="https://get.adobe.com/flashplayer/">ดาวน์โหลด
-        Flash Player ได้จาก Adobe.com</a> นอกาจากนี้ยังมี<a href="https://wiki.openstreetmap.org/wiki/Editing">ตัวเลือกอื่น
-        ๆ</a>อีกสำหรับแก้ไข OpenStreetMap
-      potlatch_unsaved_changes: คุณมีการเปลี่ยนแปลงที่ยังไม่ได้บันทึก (เมื่อต้องการบันทึกใน
-        Potlatch คุณควรเลิกเลือกเส้นทางหรือจุดปัจจุบัน หากคุณกำลังแก้ไขในโหมดสด หรือคลิกบันทึกหากคุณมีปุ่มบันทึก)
-      potlatch2_not_configured: ยังไม่ได้กำหนดค่า Potlatch 2 - โปรดดู https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-        สำหรับข้อมูลเพิ่มเติม
-      potlatch2_unsaved_changes: คุณมีการเปลี่ยนแปลงที่ยังไม่ได้บันทึก (เมื่อต้องการบันทึกใน
-        Potlatch 2 คุณจะต้องคลิกบันทึก)
       id_not_configured: ยังไม่ได้กำหนดค่า iD
       no_iframe_support: เบราว์เซอร์ของท่านไม่รองรับการใช้งานเฟรมภายในหน้า HTML จึงไม่สามารถใช้ส่วนประกอบนี้ได้
     export:

config/locales/tl.yml

@@ -122,15 +122,9 @@ tl:
     with_version: '%{id}, v%{version}'
   editor:
     default: Likas na pagtatakda (kasalukuyang %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (patnugot na nasa loob ng pantingin-tingin)
     id:
       name: iD
       description: iD (patnugot na nasa loob ng pantingin-tingin)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (patnugot na nasa loob ng pantingin-tingin)
     remote:
       name: Pangmalayong Pantaban
       description: Pangmalayong Pantaban (JOSM o Merkaartor)
@@ -1166,19 +1160,6 @@ tl:
       user_page_link: pahina ng tagagamit
       anon_edits_html: (%{link})
       anon_edits_link_text: Alamin kung bakit ganito ang katayuan.
-      flash_player_required_html: Kailangan mo ng isang tagapagpaandar na Flash upang
-        magamit ang Potlatch, ang patnugot na Flash ng OpenStreetMap. Maaari mong
-        <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">ikargang
-        paibaba ang Flash Player magmula sa Adobe.com</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Ilang
-        pang mga mapagpipilian</a> ang makukuha rin para sa pamamatnugot ng OpenStreetMap.
-      potlatch_unsaved_changes: Mayroon kang mga pagbabagong hindi pa nasasagip. (Upang
-        makapagsagip sa Potlatch, dapat mong huwag piliin ang pangkasalukuyang daan
-        o tuldok, kung namamatnugot sa pamamaraang buhay, o pindutin ang sagipin kung
-        mayroon kang isang pindutang sagipin.)
-      potlatch2_not_configured: Hindi pa naisasaayos ang Potlatch 2 - mangyaring tingnan
-        ang http://wiki.openstreetmap.org/wiki/The_Rails_Port
-      potlatch2_unsaved_changes: Mayroon kang mga pagbabagong hindi pa nasasagip.
-        (Upang masagip sa Potlatch 2, dapat mong pindutin ang sagipin.)
       no_iframe_support: Hindi tinatangkilik ng pantingin-tingin mo ang mga iframe
         ng HTML, na kailangan para sa tampok na ito.
     export:

config/locales/tr.yml

@@ -215,18 +215,12 @@ tr:
         other: '%{count} yıl önce'
   editor:
     default: Varsayılan (kullanılan %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (tarayıcı içi düzenleyici)
     id:
       name: iD
       description: iD (tarayıcı düzenleyici)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (tarayıcı içi düzenleyici)
     remote:
       name: Uzaktan Denetim
-      description: Uzaktan Denetim (JOSM veya Merkaartor)
+      description: Uzaktan Kontrolü (JOSM, Potlatch, Merkaartor)
   auth:
     providers:
       none: Hiçbiri
@@ -1900,18 +1894,6 @@ tr:
       user_page_link: kullanıcı sayfası
       anon_edits_html: (%{link})
       anon_edits_link_text: Durumun neden böyle olduğunu öğrenin.
-      flash_player_required_html: OpenStreetMap Flash düzenleyicisi Potlatch'ı kullanmak
-        için bir Flash oynatıcıya ihtiyacınız var. <a href="https://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">Adobe.com'dan
-        Flash Player yükleyebilirsiniz</a>. OpenStreetMap'i düzenlemek için başka
-        <a href="https://wiki.openstreetmap.org/wiki/Editing">birçok seçenek</a> de
-        mevcuttur.
-      potlatch_unsaved_changes: Kaydedilmemiş değişiklikleriniz mevcut. (Potlatch'te
-        kaydetmek için canlı modda düzenleme yapıyorsanız geçerli yolu veya noktayı
-        seçmeniz veya bir kaydetme düğmeniz varsa kaydet'i tıklamanız gerekir.)
-      potlatch2_not_configured: 'Potlatch 2 yapılandırılmadı - daha fazla bilgi için
-        lütfen bakınız: https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2'
-      potlatch2_unsaved_changes: Kaydedilmemiş değişiklikleriniz var. (Potlatch 2'de
-        kaydetmek için kaydet'e tıklamalısınız.)
       id_not_configured: iD yapılandırılmamış
       no_iframe_support: Bu özelliği görüntülemek için gerekli olan HTML iframe tarayıcınız
         desteklemiyor.
@@ -2024,6 +2006,15 @@ tr:
         url: https://wiki.openstreetmap.org/
         title: OpenStreetMap Viki
         description: Ayrıntılı OpenStreetMap belgeleri için wiki'ye göz atın.
+    potlatch:
+      removed: Varsayılan OpenStreetMap düzenleyiciniz Potlatch olarak ayarlanmıştır.
+        Adobe Flash Player geri çekildiğinden, Potlatch artık bir web tarayıcısında
+        kullanılamaz.
+      desktop_html: Potlatch'ı <a href="https://www.systemed.net/potlatch/">Mac ve
+        Windows için masaüstü uygulamasını indirerek</a> kullanmaya devam edebilirsiniz.
+      id_html: Alternatif olarak, varsayılan düzenleyicinizi, daha önce Potlatch'ın
+        yaptığı gibi web tarayıcınızda çalışan iD olarak ayarlayabilirsiniz. <a href="%{settings_url}">Kullanıcı
+        ayarlarınızı buradan değiştirin</a>.
     sidebar:
       search_results: Arama Sonuçları
       close: Kapat

config/locales/tt.yml

@@ -124,8 +124,6 @@ tt:
         one: 1 ел элек
         other: '%{count} ел элек'
   editor:
-    potlatch:
-      name: Potlatch 1
     id:
       name: iD
     remote:

config/locales/uk.yml

@@ -229,15 +229,9 @@ uk:
     with_name_html: '%{name} (%{id})'
   editor:
     default: Типовий (зараз %{name})
-    potlatch:
-      name: Потлач 1
-      description: Потлач 1 (редактор в оглядачі)
     id:
       name: iD
       description: iD (редактор в оглядачі)
-    potlatch2:
-      name: Потлач 2
-      description: Потлач 2 (редактор в оглядачі)
     remote:
       name: Дистанційне керування
       description: Дистанційне керування (JOSM або Merkaartor)
@@ -1639,16 +1633,6 @@ uk:
         Ви можете зробити ваші редагування загальнодоступними тут: %{user_page}.'
       user_page_link: сторінка користувача
       anon_edits_link_text: З’ясувати в чому справа.
-      flash_player_required_html: Для використання редактора Potlatch потрібний Flash-плеєр.
-        Ви можете <a href="https://get.adobe.com/flashplayer/">завантажити Flash-плеєр
-        з Adobe.com</a>. Існують також <a href="http://wiki.openstreetmap.org/wiki/Uk:Editing">інші
-        можливості</a> редагування даних в OpenStreetMap.
-      potlatch_unsaved_changes: Є незбережені зміни. (Для збереження в Potlatch зніміть
-        виділення з колії або точки, якщо редагуєте «вживу», або натисніть кнопку
-        «зберегти», якщо ви в режимі відкладеного збереження.)
-      potlatch2_not_configured: Потлатч 2 не був налаштований — див https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-      potlatch2_unsaved_changes: Ви маєте незбережені зміни. (Для збереження в Потлач
-        2, ви повинні натиснути Зберегти.)
       id_not_configured: iD не був налаштований
       no_iframe_support: Ваш оглядач не підтримує фрейми HTML, які необхідні для цієї
         функції.

config/locales/vi.yml

@@ -187,15 +187,9 @@ vi:
         other: '%{count} năm trước'
   editor:
     default: Mặc định (hiện là %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (trình vẽ trong trình duyệt)
     id:
       name: iD
       description: iD (trình vẽ trong trình duyệt)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (trình vẽ trong trình duyệt)
     remote:
       name: phần điều khiển từ xa
       description: phần điều khiển từ xa (JOSM hoặc Merkaartor)
@@ -1631,17 +1625,6 @@ vi:
         phép sửa đổi bản đồ. Bạn có thể đưa ra công khai tại %{user_page}.
       user_page_link: trang cá nhân
       anon_edits_link_text: Tại sao vậy?
-      flash_player_required_html: Bạn cần có Flash Player để sử dụng Potlatch, trình
-        vẽ OpenStreetMap bằng Flash. Bạn có thể <a href="https://get.adobe.com/flashplayer/">tải
-        về Flash Player từ Adobe.com</a>. Cũng có sẵn <a href="https://wiki.openstreetmap.org/wiki/Editing?uselang=vi">vài
-        cách khác</a> để sửa đổi OpenStreetMap.
-      potlatch_unsaved_changes: Bạn có thay đổi chưa lưu. (Để lưu trong Potlatch,
-        hãy bỏ chọn lối hoặc địa điểm đang được chọn, nếu đến sửa đổi trong chế độ
-        Áp dụng Ngay, hoặc bấm nút Lưu nếu có.)
-      potlatch2_not_configured: Potlatch 2 chưa được thiết lập. Xem thêm chi tiết
-        tại https://wiki.openstreetmap.org/wiki/The_Rails_Port?uselang=vi
-      potlatch2_unsaved_changes: Bạn chưa lưu một số thay đổi. (Trong Potlatch 2,
-        bấm nút “Save” để lưu thay đổi.)
       id_not_configured: iD chưa được cấu hình
       no_iframe_support: Tính năng này cần trình duyệt hỗ trợ khung nội bộ (iframe)
         trong HTML.

config/locales/zh-CN.yml

@@ -45,6 +45,7 @@
 # Author: VulpesVulpes825
 # Author: WQL
 # Author: Wong128cn
+# Author: Wuqianye
 # Author: Xiaomingyan
 # Author: Yfdyh000
 # Author: Zazzzz
@@ -231,15 +232,9 @@ zh-CN:
     with_name_html: '%{name} (%{id})'
   editor:
     default: 默认（目前为 %{name}）
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (浏览器内编辑器)
     id:
       name: iD
       description: iD (浏览器内编辑器)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (浏览器内编辑器)
     remote:
       name: 远程控制
       description: 远程控制 (JOSM 或 Merkaartor)
@@ -1609,6 +1604,7 @@ zh-CN:
       url: URL
     richtext_field:
       edit: 编辑
+      preview: 预览
   site:
     about:
       next: 下一页
@@ -1733,13 +1729,6 @@ zh-CN:
       user_page_link: 用户页面
       anon_edits_html: (%{link})
       anon_edits_link_text: 了解为什么这很重要。
-      flash_player_required_html: 您需要 Flash Player 来使用 OpenStreetMap Flash 编辑器 Potlatch。您可以<a
-        href="https://get.adobe.com/flashplayer/">从 Adobe.com 下载 Flash Player</a>。<a
-        href="https://wiki.openstreetmap.org/wiki/Editing">其他几种选择</a>也可以用来编辑 OpenStreetMap。
-      potlatch_unsaved_changes: 您有尚未保存的更改。(要在 Potlatch 中保存，如果在在线模式下编辑，您需要取消选择当前的路径或节点；或者点击保存，如果有保存按钮。)
-      potlatch2_not_configured: 尚未配置 Potlatch 2 - 请参阅 https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-        以获得更多信息
-      potlatch2_unsaved_changes: 您有尚未保存的更改。(要在 Potlatch 2 中保存，您应该点击保存。)
       id_not_configured: iD 尚未配置
       no_iframe_support: 您的浏览器不支持 HTML 嵌入式框架，这是此功能所需要的。
     export:

config/locales/zh-TW.yml

@@ -214,18 +214,12 @@ zh-TW:
     with_name_html: '%{name} (%{id})'
   editor:
     default: 預設 (目前為 %{name})
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (瀏覽器內編輯)
     id:
       name: iD
       description: iD (瀏覽器內編輯)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (瀏覽器內編輯)
     remote:
       name: 遠端控制
-      description: 遠端控制 (JOSM 或 Merkaartor)
+      description: 遠端控制 (JOSM、Potlatch、Merkaartor)
   auth:
     providers:
       none: 無
@@ -1780,14 +1774,6 @@ zh-TW:
       user_page_link: 使用者頁面
       anon_edits_html: (%{link})
       anon_edits_link_text: 瞭解為什麼這很重要。
-      flash_player_required_html: 您需要 Flash player 才能使用 Potlatch，OpenStreetMap Flash
-        編輯器。您可以<a href="https://get.adobe.com/flashplayer/">在 Adobe.com 下載 Flash Player</a>。<a
-        href="https://wiki.openstreetmap.org/wiki/Editing">還有其他許多選擇</a>也可以編輯 OpenStreetMap。
-      potlatch_unsaved_changes: 您還有未儲存的變更。 (要在 Potlatch 中儲存，您應該取消選擇目前的路徑或節點 (如果是在清單模式編輯)，或是點選儲存
-        (如果有儲存按鈕)。)
-      potlatch2_not_configured: Potlatch 2 尚未設定 - 請參閱 https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
-        以取得更多資訊
-      potlatch2_unsaved_changes: 您有未儲存的更改。 (要在 Potlatch 2 中儲存，您應按一下儲存。)
       id_not_configured: iD 尚未設定
       no_iframe_support: 您的瀏覽器不支援 HTML 嵌入式框架，這是這項功能所必要的。
     export:

config/locales/zh-hk.yml

@@ -149,15 +149,9 @@ zh-hk:
         other: '%{count}年前'
   editor:
     default: 預設（現為%{name}）
-    potlatch:
-      name: Potlatch 1
-      description: Potlatch 1 (瀏覽器內的編輯器)
     id:
       name: iD
       description: iD (瀏覽器內的編輯器)
-    potlatch2:
-      name: Potlatch 2
-      description: Potlatch 2 (瀏覽器內的編輯器)
     remote:
       name: 遙遠控制
       description: 遙遠控制 (JOSM 或 Merkaartor)