Merge pull request #4089 from tomhughes/trace-paging

Replace page numbers with ID based selection for trace indexes

diff --git a/Gemfile.lock b/Gemfile.lock
index 489ea66d28e559ce350af3d455e76f67c83a2b76..d166be27461c2449a6eadcd687261e0b8a3db040 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -86,8 +86,8 @@ GEM
     autoprefixer-rails (10.4.13.0)
       execjs (~> 2)
     aws-eventstream (1.2.0)
-    aws-partitions (1.787.0)
-    aws-sdk-core (3.178.0)
+    aws-partitions (1.792.0)
+    aws-sdk-core (3.179.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
       aws-sigv4 (~> 1.5)
@@ -95,8 +95,8 @@ GEM
     aws-sdk-kms (1.71.0)
       aws-sdk-core (~> 3, >= 3.177.0)
       aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.130.0)
-      aws-sdk-core (~> 3, >= 3.177.0)
+    aws-sdk-s3 (1.132.0)
+      aws-sdk-core (~> 3, >= 3.179.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.6)
     aws-sigv4 (1.6.0)
@@ -123,7 +123,7 @@ GEM
     bootstrap_form (5.2.3)
       actionpack (>= 6.0)
       activemodel (>= 6.0)
-    brakeman (6.0.0)
+    brakeman (6.0.1)
     brotli (0.4.0)
     browser (5.3.1)
     builder (3.2.4)
@@ -505,7 +505,7 @@ GEM
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
-    strong_migrations (1.5.0)
+    strong_migrations (1.6.0)
       activerecord (>= 5.2)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
@@ -531,7 +531,7 @@ GEM
     websocket-extensions (0.1.5)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.8)
+    zeitwerk (2.6.9)
 
 PLATFORMS
   ruby

diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index f49f879f898b39b22432fdbf4f7af97761f0739a..587035a1e61757748ac00083378e94768970d227 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -371,7 +371,6 @@ ar:
       public editing:
         heading: تعديل عام
         enabled: مفعَّل، غير مجهول ويمكنك تعديل البيانات.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: ما هذا؟
         disabled: مُعطل ولا يمكن تعديل البيانات، جميع التعديلات السابقة مجهولة الهوية.
         disabled link text: لماذا لا أستطيع التعديل؟
@@ -382,7 +381,6 @@ ar:
         review link text: يُرجَى اتباع هذا الرابط في الوقت الذي يناسبك لمراجعة وقبول
           شروط المساهمة الجديدة.
         agreed_with_pd: وقد أعلنت أيضًا أنك تعتبر تعديلاتك ملكية عامة.
-        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: ما هذا؟
       save changes button: حفظ التغييرات
       delete_account: حذف الحساب...

diff --git a/config/locales/bn.yml b/config/locales/bn.yml
index c9edc0ff7ad6637b5b6a8738fc32bc569001e0e1..4f883da404da6a1e0e0c41ec7ee3eb5d7450d200 100644 (file)
--- a/config/locales/bn.yml
+++ b/config/locales/bn.yml
@@ -300,7 +300,6 @@ bn:
       public editing:
         heading: পাবলিক সম্পাদনা
         enabled: সক্রিয়। বেনামী নয় এবং উপাত্ত সম্পাদনা করতে পারবে।
-        enabled link: https://wiki.openstreetmap.org/wiki/বেনামি_সম্পাদনা
         enabled link text: এটি কী?
         disabled: নিস্ক্রিয় এবং ডেটা সম্পাদনা করতে পারবেন না, সমস্ত পূর্ববর্তী সম্পাদনা
           বেনামী।
@@ -313,7 +312,6 @@ bn:
           অবদানকারীর শর্তাবলী পর্যালোচনা করুন এবং তাতে সম্মতি দিন।
         agreed_with_pd: আপনি ঘোষণা করেছেন যে আপনি আপনার সম্পাদনাগুলো পাবলিক ডোমেইনের
           অধীনে প্রকাশ করছেন।
-        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: এটি কী?
       save changes button: পরিবর্তন সংরক্ষণ
       delete_account: অ্যাকাউন্ট অপসারণ করুন...

diff --git a/config/locales/br.yml b/config/locales/br.yml
index 9b9ff5d8512f773733a006beff620be3a2ab46ee..18aa45a8ceb9f871cd2651fa9ee4f9b56ac0ad4f 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -309,7 +309,6 @@ br:
       public editing:
         heading: Kemm foran
         enabled: Gweredekaet. N'eo ket dizanv ha gallout a ra aozañ roadennoù.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: Petra eo se ?
         disabled: Diweredekaet ha ne c'hall ket aozañ roadennoù ; diznav eo an holl
           aozadennoù kent.
@@ -321,7 +320,6 @@ br:
         review link text: Heuilhit al liamm-mañ evel ma karot evit sellet ouzh diferadennoù
           nevez ar c'henlabourer hag asantiñ dezho.
         agreed_with_pd: Disklêriet hoc'h eus ivez emañ ho tegasadennoù en domani foran.
-        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: Petra eo se ?
       save changes button: Enrollañ ar c'hemmoù
       delete_account: Dilemel ar gont...

diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 2013c679dd1503f9ffcb0cd04bdc7945195a13cc..168def4ffe19c3df88a6252f4ddeb6b74cbfda6e 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -348,7 +348,6 @@ cs:
       public editing:
         heading: Veřejné editace
         enabled: Aktivní. Není anonym, smí editovat data.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: co to znamená?
         disabled: Deaktivováno, nemůže editovat data, všechny předchozí editace jsou
           anonymní.

diff --git a/config/locales/de.yml b/config/locales/de.yml
index b658894fd01a83deeaf7bcf1a22b421831fbd8ab..dfc076b12dabf0ff980441a57cd49965d16517a8 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -381,7 +381,6 @@ de:
       public editing:
         heading: Öffentliches Bearbeiten
         enabled: Aktiviert. Normales Bearbeiten der Kartendaten ist möglich.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: Was bedeutet das?
         disabled: Deaktiviert. Das Bearbeiten von Kartendaten NICHT möglich, alle
           bisherigen Bearbeitungen sind anonym.
@@ -646,8 +645,8 @@ de:
       reply_link: Eine Nachricht an den Autor senden
       comment_count:
         one: '%{count} Kommentar'
-        zero: Keine Kommentare
         other: '%{count} Kommentare'
+      no_comments: Keine Kommentare
       edit_link: Diesen Eintrag bearbeiten
       hide_link: Diesen Eintrag verbergen
       unhide_link: Diesen Eintrag nicht mehr verbergen
@@ -1532,9 +1531,9 @@ de:
     show:
       title: '%{status} Problem Nr. %{issue_id}'
       reports:
-        zero: Keine Meldungen
         one: Eine Meldung
         other: '%{count} Meldungen'
+      no_reports: Keine Berichte
       report_created_at: Zuerst gemeldet am %{datetime}
       last_resolved_at: Zuletzt erledigt am %{datetime}
       last_updated_at: Zuletzt aktualisiert am %{datetime} von %{displayname}
@@ -1978,7 +1977,7 @@ de:
           alt: Mit einem Facebook-Konto anmelden
         windowslive:
           title: Mit Windows Live anmelden
-          alt: Mit einem Windows-Live-Konto anmelden
+          alt: Mit einem Microsoft-Konto anmelden
         github:
           title: Mit GitHub anmelden
           alt: Mit einem GitHub-Konto anmelden
@@ -2090,6 +2089,7 @@ de:
           OpenStreetMap%{registered_trademark_link} sind %{open_data} (open data), lizenziert unter der
           %{odc_odbl_link} (ODbL) von der %{osm_foundation_link} (OSMF).
         introduction_1_open_data: offene Daten
+        introduction_1_odc_odbl: Open Data Commons Open Database-Lizenz
         introduction_1_osm_foundation: OpenStreetMap Stiftung
         introduction_2_html: |-
           Es steht dir frei, unsere Daten zu kopieren, weiterzugeben,
@@ -2100,6 +2100,8 @@ de:
           du das Ergebnis auch nur unter derselben Lizenz weitergeben.
           Der vollständige %{legal_code_link} erläutert deine Rechte und Pflichten.
         introduction_2_legal_code: Lizenztext
+        introduction_3_html: Unsere Dokumentation steht unter der %{creative_commons_link}-Lizenz
+          (CC BY-SA 2.0).
         credit_title_html: Wie auf die Urheberschaft von OpenStreetMap hinzuweisen
           ist
         credit_1_html: 'Wenn du OpenStreetMap-Daten verwendest, musst du die folgenden
@@ -2109,6 +2111,10 @@ de:
           alt: Beispiel, wie man auf OpenStreetMap auf einer Webseite hinweist
           title: Namensnennung-Beispiel
         more_title_html: Weitere Informationen
+        more_1_1_osmf_licence_page: OSMF-Lizenzseite
+        more_2_1_api_usage_policy: API-Nutzungsrichtlinie
+        more_2_1_tile_usage_policy: Nutzungsrichtlinie für Kacheln
+        more_2_1_nominatim_usage_policy: Nominatim-Nutzungsrichtlinie
         contributors_title_html: Unsere Mitwirkenden
         contributors_intro_html: 'Unsere Mitwirkenden sind tausende einzelne Menschen.
           Wir beziehen auch offen lizenzierte Daten von nationalen Kartenagenturen
@@ -2117,18 +2123,51 @@ de:
         contributors_at_stadt_wien: Stadt Wien
         contributors_at_cc_by: CC BY
         contributors_at_land_vorarlberg: Land Vorarlberg
+        contributors_at_cc_by_at_with_amendments: CC BY AT mit Ergänzungen
         contributors_au_australia: Australien
+        contributors_au_geoscape_australia: Geoscape Australien
+        contributors_au_cc_licence: Creative Commons Namensnennung 4.0 Internationale
+          Lizenz (CC BY 4.0)
         contributors_ca_canada: Kanada
         contributors_fi_finland: Finnland
+        contributors_fi_nlsfi_license: NLSFI-Lizenz
+        contributors_fr_credit_html: |-
+          %{france}: Enthält Daten von
+          Direction Générale des Impôts.
         contributors_fr_france: Frankreich
+        contributors_nl_credit_html: '%{netherlands}: Enthält © AND-Daten, 2007
+          (%{and_link})'
         contributors_nl_netherlands: Niederlande
+        contributors_nz_credit_html: |-
+          %{new_zealand}: Enthält Daten, die vom %{linz_data_service_link}
+           stammen und zur Wiederverwendung unter %{cc_by_link} lizenziert sind.
         contributors_nz_new_zealand: Neuseeland
+        contributors_nz_linz_data_service: LINZ-Datenservice
         contributors_nz_cc_by: CC BY 4.0
+        contributors_rs_credit_html: |-
+          %{serbia}: Enthält Daten aus %{rgz_link} und %{open_data_portal}
+          (öffentliche Informationen Serbiens), 2018.
+        contributors_rs_serbia: Serbien
         contributors_si_slovenia: Slowenien
+        contributors_si_mkgp: Ministerium für Land- und Forstwirtschaft und Ernährung
+        contributors_es_credit_html: |-
+          %{spain}: Enthält Daten vom
+          Spanish National Geographic Institute (%{ign_link}) und
+          National Cartographic System (%{scne_link})
+          lizensiert zur Wiederverwendung unter %{cc_by_link}.
         contributors_es_spain: Spanien
         contributors_es_cc_by: CC BY 4.0
+        contributors_za_credit_html: '%{south_africa}: Enthält Daten von %{ngi_link},
+          staatliches Urheberrecht vorbehalten.'
         contributors_za_south_africa: Südafrika
+        contributors_gb_credit_html: |-
+          %{united_kingdom}: Enthält Ordnance
+          Survey-Daten © Crown Copyright und Datenbankrecht
+          2010–2023.
         contributors_gb_united_kingdom: Vereinigtes Königreich
+        contributors_2_html: Weitere Einzelheiten zu diesen und anderen Quellen, die
+          zur Verbesserung von OpenStreetMap verwendet wurden, findest du unter %{contributors_page_link}
+          im OpenStreetMap-Wiki.
         contributors_footer_2_html: Die Einbeziehung von Daten bei OpenStreetMap bedeutet
           nicht, dass der ursprüngliche Datenlieferant OpenStreetMap unterstützt,
           Gewährleistung dafür gibt oder die Haftung dafür übernimmt.
@@ -2666,6 +2705,9 @@ de:
       continue: Registrieren
       terms accepted: Vielen Dank, dass du den neuen Bedingungen für Mitwirkende zugestimmt
         hast!
+      privacy_policy: Datenschutzrichtlinie
+      privacy_policy_title: OSMF-Datenschutzrichtlinie einschließlich Abschnitt zu
+        E-Mail-Adressen
     terms:
       title: Bedingungen
       heading: Bedingungen

diff --git a/config/locales/el.yml b/config/locales/el.yml
index 789f9be6ef0f2ee7f2789a267ee6c90f8c38a896..63e29623928b7e5cff55ffa7cf5248589e85b180 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -319,7 +319,6 @@ el:
         heading: Δημόσια επεξεργασία
         enabled: Ενεργοποιήθηκε. Δεν είστε πια ανώνυμοι και μπορείτε να επεξεργαστείτε
           δεδομένα.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: τι είναι αυτό;
         disabled: Απενεργοποιήθηκε και δεν μπορείτε να επεξεργαστείτε δεδομένα, όλες
           οι προηγούμενες επεξεργασίες είναι ανώνυμες.
@@ -332,7 +331,6 @@ el:
           σας και την αποδοχή των νέων όρων συνεισφοράς.
         agreed_with_pd: Δηλώσατε επίσης ότι αποδέχεστε ότι οι τροποποιήσεις σας ανήκουν
           στον δημόσιο τομέα.
-        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: τι είναι αυτό;
       save changes button: Αποθήκευση αλλαγών
       delete_account: Διαγραφή λογαριασμού...

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 3736ac043b6e8cff1b1eaabe292c0b6892cc522b..3b7cecfbe1e752c1933ceb663656fc754ca6fd48 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -380,7 +380,6 @@ es:
           y aceptar los nuevos Términos de colaborador.
         agreed_with_pd: También ha declarado que considera que sus ediciones son de
           Dominio Público.
-        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: ¿Qué es esto?
       save changes button: Guardar cambios
       delete_account: Eliminar cuenta...

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index b7f0a52a8367a464804c47ca1567917b67b7bed0..abc3e8d4d68c99e6d3b597191716cdd4e979b050 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -294,7 +294,6 @@ eu:
       public editing:
         heading: Aldaketa publikoa
         enabled: Gaituta. Ez da anonimoa eta datuak editatu ditzake.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: zer da hau?
         disabled: Ezgaituta dago eta ezin ditu datuak editatu, aurreko aldaketa guztiak
           anonimoak dira.
@@ -306,7 +305,6 @@ eu:
         review link text: Mesedez, jarraitu esteka hau zure Kolaboratzaile Terminoaen
           erosotasuna berrikusteko eta onartzeko.
         agreed_with_pd: Zure aldaketak domeinu publikoan egongo direla adierazi duzu.
-        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: zer da hau?
       save changes button: Aldaketak gorde
       delete_account: Ezabatu kontua...

diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 3b476a79b3a381a33580ea3717f732d2586661fb..1fe2ebb3952d70d0f3e294b761b6d21e9c61ce52 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -292,7 +292,6 @@ gl:
       public editing:
         heading: Edición pública
         enabled: Activado. Non es anónimo e podes editar os datos.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: que é isto?
         disabled: Desactivado e non pode editar os datos. Tódalas anteriores edicións
           son anónimas.
@@ -305,7 +304,6 @@ gl:
           do contribuínte.
         agreed_with_pd: Tamén declarou que coida que as súas edicións pertencen ó
           dominio público.
-        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: que é isto?
       save changes button: Gardar as modificacións
       delete_account: Borrar a conta...

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 56a8d20fdf02dac39f027be9b978a0f51a8f285f..f24e1f46ed0df304da799bda01ff27b19dbfe4da 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -504,7 +504,7 @@ he:
       view_changeset_details: הצגת פרטי ערכת שינויים
     changesets:
       id: מזהה
-      saved_at: נשמרו ב
+      saved_at: נשמרו ב־
       user: משתמש
       comment: תגובה
       area: שטח

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 6593b13b38e1a066387b183e31ca5516fcf655dd..8cf4d9958f91d54553a02958505879f19b97f5af 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -308,7 +308,6 @@ hu:
       public editing:
         heading: Nyilvános szerkesztés
         enabled: Engedélyezve. Nem vagy névtelen, így szerkesztheted az adatokat.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: mi ez?
         disabled: Tiltva, így nem szerkesztheted az adatokat, az összes eddigi szerkesztés
           névtelen.
@@ -320,7 +319,6 @@ hu:
         review link text: Kérjük, kövesd ezt a hivatkozást az új közreműködési feltételek
           áttekintéséhez és elfogadásához.
         agreed_with_pd: Azt is kijelentetted, hogy a szerkesztéseid közkincsnek tekinthetők.
-        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms
         link text: mi ez?
       save changes button: Módosítások mentése
       delete_account: Fiók törlése…

diff --git a/config/locales/ia.yml b/config/locales/ia.yml
index c76f0331a986279e87f08b6637984a8fa701a185..88cf6b5b5e890d1d5405fd8d266f88a47ecfb7b7 100644 (file)
--- a/config/locales/ia.yml
+++ b/config/locales/ia.yml
@@ -281,7 +281,6 @@ ia:
       public editing:
         heading: Modification public
         enabled: Activate. Non anonyme e pote modificar datos.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: que es isto?
         disabled: Disactivate e non pote modificar datos, tote le previe modificationes
           es anonyme.
@@ -294,7 +293,6 @@ ia:
           e acceptar le nove Conditiones de Contributor.
         agreed_with_pd: Tu ha anque declarate que tu considera tu modificationes como
           liberate al Dominio Public.
-        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: que es isto?
       save changes button: Salveguardar modificationes
       delete_account: Deler conto…

diff --git a/config/locales/id.yml b/config/locales/id.yml
index 585df49604fbad59a2e4cfee15c5c0ff7310f517..461a31467aa736a73936199cc86916e5747fb870 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -311,7 +311,6 @@ id:
       public editing:
         heading: Mengedit secara publik
         enabled: Diaktifkan. Tidak anonim dan dapat mengedit data.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: Apa ini?
         disabled: Dinonaktifkan dan tidak dapat mengedit data, seluruh hasil edit
           sebelumnya anonim.
@@ -324,7 +323,6 @@ id:
           dan menyetujui Persyaratan Kontributor yang baru.
         agreed_with_pd: Anda juga telah menyatakan bahwa Anda mempertimbangkan suntingan
           Anda berada dalam Domain publik.
-        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: Apa ini?
       save changes button: Simpan Perubahan
       delete_account: Hapus Akun...

diff --git a/config/locales/is.yml b/config/locales/is.yml
index f90838c42c119fa13200d45d38d2da9adc714777..c561c763fea4e7de056aab9ebafda13603855c0c 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -295,7 +295,6 @@ is:
       public editing:
         heading: Nafngreindar breytingar
         enabled: Virkt. Ekki nafnlaus og getur breytt gögnum.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: Hvað er þetta?
         disabled: Óvirkur og getur ekki breytt gögnum, allar fyrri breytingar eru
           ónafngreindar.
@@ -309,7 +308,6 @@ is:
           skilmálana vegna framlags þíns.
         agreed_with_pd: Þú hefur einnig lýst því yfir að breytingar þínar verði í
           almenningseigu (Public Domain).
-        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: Hvað er þetta?
       save changes button: Vista breytingar
       delete_account: Eyði aðgangi...

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 8af519c4a0e2c32dea42b049a467d90c372b552e..7cc8e6feb355975fefbc3e08a46f71c3b5418df1 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -284,7 +284,6 @@ ko:
       public editing:
         heading: 공개 편집
         enabled: 활성화했습니다. 익명이 아니며 데이터를 편집할 수 있습니다.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: 무엇인가요?
         disabled: 바활성화되어 데이터를 편집할 수 없으며, 모든 이전 편집은 익명입니다.
         disabled link text: 왜 편집할 수 없나요?
@@ -294,7 +293,6 @@ ko:
         not yet agreed: 아직 새 기여자 약관에 동의하지 않았습니다.
         review link text: 원하는 시간에 이 링크를 따라 새로운 기여자 약관을 검토하고 수락하세요.
         agreed_with_pd: 또한 자신의 편집이 퍼블릭 도메인에 있어야 한다고 생각하는 것도 선언하고 있습니다.
-        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: 무엇인가요?
       save changes button: 변경사항 저장
       delete_account: 계정 삭제...

diff --git a/config/locales/ku-Latn.yml b/config/locales/ku-Latn.yml
index 4618abb9109a876b62473744fb64a927040a739e..4a739d40d097dc1996663d0d74f2a6358a7c27d0 100644 (file)
--- a/config/locales/ku-Latn.yml
+++ b/config/locales/ku-Latn.yml
@@ -284,7 +284,6 @@ ku-Latn:
       public editing:
         heading: Guherandina ji her kesê re vekirî
         enabled: Çalak e. Ne anonîm e û dikare daneyan biguherîne.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: Ev çiye?
         disabled: Neçalak e û nikare daneyan biguherîne, hemû guherandinên berê anonîm
           in.
@@ -297,7 +296,6 @@ ku-Latn:
           bikî û qebûl bikî xêra xwe vê lînkê taqîb bike.
         agreed_with_pd: Herwiha te beyan kir ku tu dixwazî guherandinên te wek Malê
           Giştî were qebûlkirin.
-        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: Ev çi ye?
       save changes button: Guherandinan qeyd bike
       delete_account: Hesabê Jê bibe...

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 70aeaae537e5498223c3a9ca60ce6edf3c1f1421..700c5ae041c1452ae2ac0f4c80f39cf662497439 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -285,7 +285,6 @@ lb:
       public editing:
         heading: Ëffentlecht Beaarbechten
         enabled: Aktivéiert. Net anonym a kann Daten änneren.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: wat ass dëst?
         disabled: Déaktivéiert an kann keng Daten änneren, all vireg Beaarbeschtungen
           sinn anonym.
@@ -299,7 +298,6 @@ lb:
           ze gesinn an ze akzeptéieren.
         agreed_with_pd: Dir hudd och deklaréiert dass Dir Är Ännerungen der Öffentlechkeet
           zur Verfügung stellt (Public Domain).
-        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: wat ass dëst?
       save changes button: Ännerunge späicheren
       delete_account: Benotzerkont läschen...

diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 1b298109903cfba3ee75d7cb694c1d294a648e8a..f21b45ba76f660e4b4a542e967833aefec92ac5a 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -322,7 +322,6 @@ lt:
       public editing:
         heading: Viešas keitimas
         enabled: Įjungtas. Nėra anoniminis ir gali keisti duomenis.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: kas tai?
         disabled: Išjungtas ir negali keisti duomenų, visi ankstesni pakeitimai yra
           anonimiški.
@@ -335,7 +334,6 @@ lt:
           talkininkų sąlygas.
         agreed_with_pd: Jūs taip pat pareiškėte, kad visi jūsų pakeitimai yra viešo
           naudojimo.
-        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: kas tai?
       save changes button: Įrašyti pakeitimus
       delete_account: Ištrinti paskyrą...

diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index ccadc3832045e8464d8eb402375e41bb4389e0c7..253e7fc4054909aba6c2980eab8b4deb16f36ac3 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -280,7 +280,6 @@ mk:
       public editing:
         heading: Јавно уредување
         enabled: Овозможено. Сега не е анонимно и може да се уредуваат податоци.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: што е ова?
         disabled: Оневозможено и не може да се уредуваат податоци, сите претходни
           уредувања се анонимни.
@@ -293,7 +292,6 @@ mk:
           и прифатите новите Услови за учество
         agreed_with_pd: Исто така изјавивте дека вашите уредувања ги сметате за јавна
           сопственост.
-        link: https://wiki.osmfoundation.org/wiki/License/Contributor_Terms?uselang=mk
         link text: што е ова?
       save changes button: Зачувај ги промените
       delete_account: Избриши сметка...

diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index c71ef92099f8846db33b0d44e92d0b229df6d1ca..e898125f7e8bdedba34743a1d60061468169db56 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -336,7 +336,6 @@ nl:
       public editing:
         heading: Openbaar bewerken
         enabled: Ingeschakeld. U bent niet anoniem en u kunt bewerken.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: wat is dit?
         disabled: Uitgeschakeld. U kunt niet bewerken en al uw eerdere bewerkingen
           zijn anoniem.
@@ -349,7 +348,6 @@ nl:
           te lezen en te accepteren.
         agreed_with_pd: U hebt ook verklaard dat uw bijdragen onderdeel zijn van het
           Publieke domein.
-        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: wat is dit?
       save changes button: Wijzigingen opslaan
       delete_account: Account verwijderen...

diff --git a/config/locales/nqo.yml b/config/locales/nqo.yml
index 98a67db1950339bfa6f39a1c1d668b08c3403767..a4b75184178db8037e457fd9c900be4f852fc6de 100644 (file)
--- a/config/locales/nqo.yml
+++ b/config/locales/nqo.yml
@@ -178,7 +178,7 @@ nqo:
       openid: ߏߔߌ߲ ID
       google: ߜ߭ߎߜ߭ߏߟ
       facebook: ߝߋߛߑߓߎߞ
-      windowslive: ߥß\8cß²ß\98ß\8fß\9b ß\9fß\8a߯ß\8cß\9dß­
+      windowslive: ß¡ß\8cß\9eß\99ß\8fß\9bß\90ß\9dß\95
       github: GitHub
       wikipedia: ߥߞߌߔߋߘߌߦߊ
   api:
@@ -251,11 +251,25 @@ nqo:
         heading: ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ ߛߙߊߕߌ ߟߎ߬
         agreed: ߌ ߓߘߊ߫ ߘߌ߬ߢߍ߫ ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ߠߊ߫ ߞߎߘߊ ߛߙߊߕߌ ߟߎ߬ ߡߊ߬.
         not yet agreed: ߌ ߡߊ߫ ߘߌ߬ߢߍ߬ ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ߠߊ߫ ߞߎߘߊ ߛߙߊߕߌ ߟߎ߬ ߡߊ߬ ߡߎߣߎ߲߬.
+        review link text: ߛߘߌ߬ߜߋ߲ ߣߌ߲߬ ߠߊߓߊ߬ߕߏ߫ ߌ ߟߊ߫ ߓߍ߲߬ߢߐ߲߰ߡߊ ߘߌ߫ ߖߊ߰ߣߌ߲߫߸، ߞߊ߬
+          ߓߟߏߡߊߜߍ߲߫ ߞߎߘߊ ߛߙߊߕߌ ߟߎ߬ ߖߊ߬ߕߋߡߌ߬ߘߊ߬߸ ߊ߬ ߣߌ߫ ߞߵߊ߬ߟߎ߬ ߟߊߡߌ߬ߣߊ߬.
+        agreed_with_pd: ߌ ߓߘߊ߫ ߓߊ߲߫ ߊ߬ ߦߌ߬ߘߊ߬ ߟߊ߫ ߞߴߌ ߦߴߌ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߖߊ߬ߕߋ߬
+          ߟߊ߫ ߞߵߊ߬ ߦߋ߫ ߞߍ߫ ߝߘߏ߬ߓߊ߬ ߘߊߞߎ߲ ߘߐ߫.
         link text: ߡߎ߲߬ ߦߋ߫ ߣߌ߲߬ ߘߌ߫؟
       save changes button: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬ ߠߊߞߎ߲߬ߘߎ߬
       delete_account: ߖߊ߬ߕߋ߬ߘߊ ߖߏ߰ߛߌ߬ߟߌ...
     go_public:
       heading: ߖߊ߬ߡߊ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲
+      currently_not_public: ߌ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬ ߦߋ߫ ߕߐ߯ߒߕߊ߲ߧߊ ߟߋ߬ ߘߐ߫ ߥߊ߯ߕߌ ߣߌ߲߬
+        ߠߊ߫، ߏ߬ ߘߐ߫߸ ߡߐ߱ ߟߎ߬ ߕߍߣߊ߬ ߛߋ߫ ߟߊ߫ ߗߋߛߓߍ߫ ߗߋ߫ ߟߴߌ ߡߊ߬ ߞߎߡߊ߫ ߕߴߌ ߘߌ߲߬ߞߌߙߊ ߟߐ߲߫
+        ߞߏ ߡߊ߬. ߖߐ߲߬ߛߊ߫ ߞߵߌ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߣߍ߲ ߠߎ߬ ߦߌ߬ߘߊ߬ ߥߟߊ߫ ߞߊ߬ ߡߐ߱ ߟߎ߬ ߟߊߘߌ߬ߢߍ߬
+        ߌ ߡߊߛߐ߬ߘߐ߲ ߘߐ߫ ߓߟߐߛߐ߫ ߞߍߦߙߐ ߟߊ߫، ߘߎ߰ߟߊ߬ߘߐ߬ ߞߘߎ ߛߐ߲߬ߞߌ߲߫.
+      only_public_can_edit: ߞߊ߬ߦߌ߯ API ߀.߆ ߟߊߓߊ߯ߙߊ ߘߊߡߌ߬ߣߊ߬ ߘߊ߫، ߜߍߘߐ߫ (ߖߊ߬ߡߊ ߢߊߞߘߐ߫)
+        ߓߟߏߡߊߜߍ߲ߠߊ ߟߎ߬ ߘߐߙߐ߲߫ ߠߋ߬ ߦߋ߫ ߛߋ߫ ߟߊ߫ ߔߊ߬ߔߘߊ ߞߣߐߘߐ ߟߎ߬ ߡߊߦߟߍ߬ߡߊ߲߬ ߠߊ߫.
+      find_out_why: ߊ߬ ߢߊߢߌߣߌ߲߫ ߓߊ߫ ߡߎ߲߬ߠߊ߫
+      email_not_revealed: ߌ ߟߊ߫ ߢߎߡߍߙߋ߲ߞߏ߲ߘߏ ߕߍߣߊ߬ ߝߊߙߊ߲ߛߊ߫ ߖߊ߬ߡߊ߫ ߣߊ߬ߕߐ ߟߎ߬ ߓߟߏ߫.
+      not_reversible: ߒ߬ߓߊ߬ ߞߍߟߌ ߏ߬ ߘߏ߲߬ ߕߍߣߊ߬ ߣߊ߬ ߟߊ߫ ߓߐ߫ ߟߴߊ߬ ߡߊ߬، ߊ߬ ߘߏ߲߬ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫
+        ߞߎߘߊ ߟߎ߬ ߓߍ߯ ߦߋ߫ ߜߍߘߐߡߐ߮ ߟߋ߬ ߘߌ߫ ߘߊ߲ߛߎ߲ ߓߟߏ߫ ߡߎ߬ߕߎ߲߬.
       make_edits_public_button: ߊ߬ ߓߍ߯ ߞߍ߫ ߒ ߠߊ߫ ߖߡߊ߬ߘߐ߬ ߡߊߦߟߍߡߊ߲ߠߌ߲ ߘߌ߫
     update:
       success_confirm_needed: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߞߌ߬ߓߊ߬ߙߏ߬ߦߊ ߓߘߊ߫ ߟߊߞߎߘߦߊ߫ ߞߏߟߌߞߏߟߌ߫. ߌ ߟߊ߫
@@ -266,6 +280,12 @@ nqo:
   browse:
     created: ߛߌ߲ߘߌߣߍ߲
     closed: ߘߊߕߎ߲߯ߣߍ߲
+    created_ago_html: ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{time_ago}
+    closed_ago_html: ߘߊߕߎ߯ߣߍ߲߫ ߦߋ߫ %{time_ago}
+    created_ago_by_html: ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{time_ago} %{user} ߓߟߏ߫
+    closed_ago_by_html: ߘߊߕߎ߲߯ߣߍ߲߫ ߦߋ߫ %{time_ago} ߟߊ߫ %{user} ߓߟߏ߫
+    deleted_ago_by_html: ߖߏ߰ߛߌ߬ߣߍ߲߬ ߦߋ߫ %{time_ago} ߟߋ߬ ߟߊ߫ %{user} ߓߟߏ߫
+    edited_ago_by_html: ߡߊߙߟߍ߬ߡߊ߲߬ߣߍ߲߬ ߦߋ߫ %{time_ago} ߟߋ߬ ߟߊ߫ %{user} ߓߟߏ߫
     version: ߦߌߟߡߊ
     in_changeset: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
     anonymous: ߕߐ߯ߒߕߊ߲
@@ -285,6 +305,8 @@ nqo:
       relation: ߕߍߓߊ߯ߦߊ (%{count})
       relation_paginated: ߕߍߓߊ߯ߦߊ (%{x}-%{y} %{count})
       comment: ߡߙߌߣߊ߲ (%{count})
+      hidden_comment_by_html: ߞߊ߲߬ߞߎߡߊ ߥߣߊ߬ߙߌ߬ߣߍ߲߬ ߦߋ߫ %{user} ߡߊ߬ %{time_ago} ߟߊ߫
+      comment_by_html: ߞߊ߲߬ߞߎߡߊ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫ %{time_ago} ߡߊ߬
       changesetxml: XML ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
       osmchangexml: ߏ.ߛ.ߡ ߡߝߊ߬ߟߋ߲߬ߠߌ߲ XML
       feed:
@@ -292,6 +314,8 @@ nqo:
         title_comment: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߙߎ %{id} - %{comment}
       join_discussion: ߌ ߜߊ߲߬ߞߎ߲߫ ߞߊ߬ ߕߘߍ߬ ߡߙߌߣߊ߲߫ ߦߌߘߊ ߘߐ߫
       discussion: ߘߊߘߐߖߊߥߏ
+      still_open: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߠߎ߬ ߟߊߞߊ߬ߣߍ߲߫ ߦߋ߫ ߡߎߣߎ߲߬ - ߘߊߘߐߖߊߥߏ
+        ߘߌ߫ ߘߊߦߟߍ߬ ߣߌ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߠߎ߬ ߕߎ߯ ߘߊ߫ ߕߎ߬ߡߊ ߡߍ߲ ߠߊ߫.
     node:
       title_html: 'ߥߎߙߋ߲ߛߋ߲: %{name}'
       history_title_html: 'ߥߎߙߋ߲ߛߋ߲ ߘߐ߬ߝߐ: %{name}'
@@ -391,9 +415,19 @@ nqo:
         ߊ߬ ߓߘߊ߫ ߥߛߎ߬ ߖߊ߲߬ߓߊ ߟߋ߬ ߕߵߊ߬ ߡߊߛߐ߬ߘߐ߲ ߘߐ߫.
   changeset_comments:
     comment:
+      comment: ߞߊ߲߬ߞߎ߬ߡߊ߬ ߞߎߘߊ߫ ߦߋ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ %{changeset_id} %{author}
+        ߓߟߏ߫
       commented_at_by_html: ߊ߬ ߟߊߘߎߘߦߊߣߍ߲߫ ߦߋ߫ %{when} ߊ߬ ߣߌ߫ %{user} ߓߟߏ߫
+    comments:
+      comment: ߞߊ߲߬ߞߎ߬ߡߊ߬ ߞߎߘߊ߫ ߦߋ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ %{changeset_id} ߠߊ߫
+        %{author} ߓߟߏ߫
     index:
       title_all: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߫ ߞߙߎ ߘߊߘߐߖߊߥߏ
+      title_particular: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ %{changeset_id}
+        ߘߊߘߐߖߊߥߏ
+    timeout:
+      sorry: ߤߊߞߍ߬ߕߏ߫߸ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߠߊߞߊ߬ߝߏ߬ߣߍ߲ ߞߊ߲߬ߞߎߡߊ ߛߙߍߘߍ ߡߍ߲ ߡߊߢߌߣߌ߲ ߦߴߌ
+        ߘߐ߫ ߌ ߓߟߏ߫߸ ߊ߬ ߓߘߊ߫ ߥߛߎ߬ ߖߊ߲߬ߓߊ ߟߋ߬ ߞߵߊ߬ ߡߊߛߐ߬ߘߐ߲ ߘߐ߫.
   dashboards:
     contact:
       km away: ߞߎߘߍ %{count} ߝߏ߬ߣߊ߲ ߠߊ߫
@@ -444,11 +478,12 @@ nqo:
       title: ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߛߎ߮ ߏ߬ ߕߴߦߋ߲߬
       heading: 'ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߕߴߦߋ߲߬ id: %{id} ߘߌ߫'
     diary_entry:
-      posted_by_html: ߊ߬ ߟߊߦߟߍ߬ߣߍ߲߬ ߦߋ߫ %{link_user} ߓߟߏ߫ %{created} %{language_link}
-        ß\9fß\8b߬ ß\9eß\8a߲߬
+      posted_by_html: ߊ߬ ߟߊߦߟߍ߬ߣߍ߲߬ ߦߋ߫ %{link_user} ߓߟߏ߫ %{created} ߦߋ߫ %{language_link}
+        ß\9fß\8b߬ ß\98ß\90ß«
       updated_at_html: ߟߊ߬ߞߎ߬ߘߦߊ߬ߟߌ߬ ߞߐߟߕߊ %{updated} ߘߐ߫
       comment_link: ߡߙߌߣߊ߲ ߡߍ߲ ߦߋ߫ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߣߌ߲߬ ߠߊ߫
       reply_link: ߗߋߛߓߍ ߗߋ߫ ߛߓߍߦߟߊ ߡߊ߬
+      no_comments: ߞߊ߲߬ߞߎ߬ߡߊ߬ ߕߴߦߋ߲߬
       edit_link: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߣߌ߲߬ ߡߊߦߟߍ߬ߡߊ߲߫
       hide_link: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߣߌ߲߬ ߢߡߊߘߏ߲߰
       unhide_link: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߣߌ߲߬ ߢߡߊߘߏ߲߰ߣߍ߲ ߓߐ߫
@@ -514,6 +549,10 @@ nqo:
       success: '%{name} ߓߘߊ߫ ߓߊ߲߫ ߓߐ߫ ߟߴߌ ߕߋߙߌߦߊ ߟߊ߫'
       not_a_friend: '%{name} ߕߴߌ ߕߋߙߌ ߝߋ߲߫ ߘߌ߫.'
   geocoder:
+    search:
+      title:
+        results_from_html: ߞߐߝߟߌ ߝߘߊߣߍ߲߫ ߦߋ߫ %{results_link} ߟߋ߬ ߟߊ߫
+        latlon: ߞߣߐߟߊ
     search_osm_nominatim:
       prefix:
         aerialway:
@@ -603,11 +642,13 @@ nqo:
           public_bath: ߝߘߏ߬ߓߊ߬ ߞߏ߬ߦߙߐ
           public_bookcase: ߝߘߏ߬ߓߊ߬ ߛߓߍߘߊ
           public_building: ߝߘߏ߬ߓߊ߬ ߓߏ߲
+          recycling: ߟߊ߬ߞߎ߬ߘߦߊ߬ߟߌ߫ ߘߊߞߎ߲ (recyclage)
           restaurant: ߘߊߥߎ߲ߠߌ߲߫ ߦߙߐ
           school: ߞߊ߬ߙߊ߲߬ߕߊ
           shelter: ߥߊ߬ߣߊߙߌ
           shower: ߢߍ߲߮
           social_centre: ߘߍ߬ߘߐ߬ߞߏ ߟߎ߫ ߕߊ߲ߓߊ߲
+          social_facility: ߘߍ߬ߢߐ߲߰ߦߊ߬ ߗߋߘߊ \ ߓߊ߬ߛߊ߲߬ߢߐ߲߰ߘߐ߬ ߘߊߞߎ߲
           studio: ߓߟߏߦߊߛߏ
           swimming_pool: ߣߊߡߎ߲ߠߌ߲߫ ߘߟߊ
           taxi: ߥߊߟߌߥߊߟߌ
@@ -616,12 +657,14 @@ nqo:
           toilets: ߢߍ߲߮
           townhall: ߛߏߕߌ߯ߘߊ
           university: ߖߊ߯ߓߘߊ
+          vehicle_inspection: ߓߏ߬ߙߌ߬ߝߋ߲߬ ߝߛߍ߬ߝߛߍ߫ ߦߌߟߊ
           vending_machine: ߝߋ߰ߙߋ߬ߞߍ߬ ߕߙߏߞߏ
           veterinary: ߓߌߦߊ߲ߘߊ߲ߘߟߊ ߘߐ߬ߓߛߏ߬ߟߌ
           village_hall: ߕߏ߯ߘߊ ߛߏߕߌ߯ߟߊ߫
           waste_basket: ߢߡߊ߬ߞߍ߬ߝߋ߲
           waste_disposal: ߢߡߊ߬ߘߊ߲߬ߘߊ߫ ߦߌߟߊ
           waste_dump_site: ߛߎ߬ߣߎ߲߬ߞߎ߲
+          watering_place: ߖߌߡߊ߫ ߦߙߐ
           water_point: ߖߌ߫ ߡߊ߫ ߦߙߐ
           weighbridge: ߖߌߘߊ߲ߕߊ߫ ߛߍ߲
         boundary:

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index ba60e572908f772011d598b8ae8c0a8d16547984..357d434e0c8416f96856fa3e42e567f2f0a48a12 100644 (file)
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -284,7 +284,6 @@ oc:
       public editing:
         heading: Modificacion publica
         enabled: Activat. Pas anonim e pòt modificar lei donadas.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: qu’es aquò ?
         disabled: Desactivadas e sensa permés per editar; lei modificacions anterioras
           son anonimas.

diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 067ded485b31be45c7158a2c4c3ebd2112281e44..df7bc45555b62d629d2dcce5530b469a5f030350 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -366,7 +366,6 @@ pl:
       public editing:
         heading: 'Edycje publiczne:'
         enabled: Włączone. Nieanonimowy i uprawniony do edycji danych.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: co to jest?
         disabled: Wyłączone i nieuprawniony do edycji danych, wszystkie wcześniejsze
           edycje są anonimowe.
@@ -378,7 +377,6 @@ pl:
         review link text: Na tej stronie możesz zapoznać się z nowymi Warunkami Uczestnictwa
           i je zaakceptować.
         agreed_with_pd: Zadeklarowałeś, że twoje edycje publikujesz w domenie publicznej.
-        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: co to jest?
       save changes button: Zapisz zmiany
       delete_account: Usuń konto...
@@ -2237,6 +2235,8 @@ pl:
             własnoręcznie.
       other_concerns:
         title: Inne kwestie
+        copyright: strona z prawami autorskimi
+        working_group: Grupa robocza OSMF
     help:
       title: Uzyskiwanie pomocy
       introduction: OpenStreetMap ma wiele zasobów pomocnych w poznawaniu projektu,
@@ -2386,6 +2386,10 @@ pl:
         node: węzeł
       rules:
         title: Zasady!
+        para_1_html: |-
+          OpenStreetMap ma kilka formalnych zasad, ale oczekujemy, że wszyscy uczestnicy będą współpracować i komunikować się ze społecznością. Jeśli rozważasz
+          jakąkolwiek czynność inną niż ręczna edycja, przeczytaj i postępuj zgodnie ze wskazówkami na
+          %{imports_link} i %{automated_edits_link}.
         imports: Import
         automated_edits: Zautomatyzowane edycje
       start_mapping: Rozpocznij mapowanie

diff --git a/config/locales/pt-PT.yml b/config/locales/pt-PT.yml
index d9d58368330a909bef02f46272105c75a0954295..a154a76f0e9dca6cd178ab1f616c963c5508f174 100644 (file)
--- a/config/locales/pt-PT.yml
+++ b/config/locales/pt-PT.yml
@@ -328,7 +328,6 @@ pt-PT:
           os novos Termos de Contribuidor.
         agreed_with_pd: Também declaraste que as tuas edições são disponibilizadas
           em Domínio Público.
-        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: o que é isto?
       save changes button: Gravar alterações
       delete_account: Apagar Conta...

diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 21e8d5b88dbdfe621bba161532ee40c1afb8ee96..2fd61dcddbd695ce17f8caf6e3c92431ccc0c6c7 100644 (file)
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -347,7 +347,6 @@ pt:
           e aceitar os novos Termos de Contribuição.
         agreed_with_pd: Você também declara que considera suas edições em Domínio
           Público.
-        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: o que é isso?
       save changes button: Salvar alterações
       delete_account: Eliminar Conta...

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 952aeedb00de14472d69c0142dea7610dc6f638e..b2e708d2adac363141300717c41c04c0b2bc23f3 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -232,7 +232,7 @@ ro:
       openid: OpenID
       google: OpenID
       facebook: OpenID
-      windowslive: Windows Live
+      windowslive: Microsoft
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -258,6 +258,21 @@ ro:
       entry:
         comment: Comentariu
         full: Notă completă
+  account:
+    deletions:
+      show:
+        title: Șterge Contul Meu
+        warning: Atenție! Procesul de ștergere al contului este final și nu se poate
+          reveni.
+        delete_account: Șterge Cont
+        delete_introduction: 'Vă puteți șterge contul OpenStreetMap folosind butonul
+          de mai jos. Vă rugăm să rețineți următoarele detalii:'
+        delete_profile: Informațiile de profil, inclusiv avatarul, descrierea și locația
+          de acasă vor fi șterse.
+        delete_display_name: Numele dvs. afișat va fi eliminat și poate fi reutilizat
+          de alte conturi.
+        retain_caveats: 'Cu toate acestea, unele informații despre dvs. vor fi păstrate
+          pe OpenStreetMap, chiar și după ștergerea contului:'
   accounts:
     edit:
       title: Modificare cont
@@ -593,7 +608,7 @@ ro:
           runway: Pistă
           taxilane: Banda de taxi
           taxiway: Pistă de manevră
-          terminal: Terminal
+          terminal: Terminal Aeroport
           windsock: Con de vânt
         amenity:
           animal_boarding: Îmbarcarea animalelor
@@ -639,7 +654,7 @@ ro:
           fire_station: Stație de pompieri
           food_court: Sală de mese
           fountain: Fântână
-          fuel: Benzinărie
+          fuel: Stație de alimentare
           gambling: Jocuri de noroc
           grave_yard: Cimitir
           grit_bin: Coș de gunoi
@@ -727,7 +742,7 @@ ro:
           chapel: Capelă
           church: Clădire de Biserică
           civic: Clădire Municipală
-          college: Clădirea colegiu
+          college: Clădire Colegiu
           commercial: Clădire comercială
           construction: Clădire în construcție
           detached: Casă decomandată
@@ -855,6 +870,7 @@ ro:
           trailhead: Punct pornire traseu
           trunk: Drum strategic
           trunk_link: Drum strategic
+          turning_circle: Loc de întoarcere
           turning_loop: Buclă de întoarcere
           unclassified: Drum neclasificat
           "yes": Drum

diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 29d2b49ce4c4c3bdf1d0b63d87b1efc783a751a7..afffbbf01dcea4b3e6b74c1c06756592e17249fa 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -318,7 +318,6 @@ sl:
       public editing:
         heading: Javno urejanje
         enabled: Omogočeno. Niste anonimni in lahko urejate podatke.
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: Kaj je to?
         disabled: Onemogočeno in ne morete urejati podatkov. Vsi vaši prejšnji prispevki
           so anonimni.
@@ -330,7 +329,6 @@ sl:
         review link text: Prosimo sledite tej povezavi, ko imate čas da pregledate
           in sprejmete nove pogoje sodelovanja..
         agreed_with_pd: Prav tako ste izjavili, da so vaša urejanja v javni domeni.
-        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: Kaj je to?
       save changes button: Shrani spremembe
       delete_account: Izbriši račun ...

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index e70332df14a05fee9fae9364fd5dac6f7a01ba93..706111db0cad1e53b06732d05afd75f3c2ed1740 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -336,7 +336,6 @@ tr:
         review link text: Yeni Katkıda Bulunma Şartlarını incelemek ve kabul etmek
           için lütfen bu bağlantıyı kolaylık sağlamak için izleyin.
         agreed_with_pd: Ayrıca düzenlediklerin Kamu Malı olsun diye kabul ettin.
-        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: bu nedir?
       save changes button: Değişiklikleri Kaydet
       delete_account: Hesabı Sil...

diff --git a/config/locales/tt.yml b/config/locales/tt.yml
index c2edf478e7d72fd87e6d8f8bdf0a355b2b9528d1..e9797e8b27553caf7b2a7b6bdc7b5e44516a72ee 100644 (file)
--- a/config/locales/tt.yml
+++ b/config/locales/tt.yml
@@ -279,7 +279,6 @@ tt:
       public editing:
         heading: Барысына күренерлек үзгәртүләр
         enabled: Кабызылган. Мөхәррирләргә була. Үзгәртүләр аноним түгел.
-        enabled link: https://wiki.openstreetmap.org/wiki/TT:Аноним_үзгәртүләр
         enabled link text: бу нәрсә?
         disabled: Сүндерелгән һәм яңа кертемнәр ясый алмый, моңарчы ясалган үзгәртүләр
           аноним була кала.
@@ -292,7 +291,6 @@ tt:
           Шартлары белән риза булуыгызны белдерегез.
         agreed_with_pd: Сез шулай ук үзгәртүләрегезнең җәмгыять кулланышына күчүенә
           ризалык белдердегез.
-        link: https://wiki.openstreetmap.org/wiki/TT:Open_Database_License/Contributor_Terms?uselang=tt
         link text: бу нәрсә?
       save changes button: Үзгәрешләрне саклау
       delete_account: Хисапъязманы бетерергә...

diff --git a/config/locales/xmf.yml b/config/locales/xmf.yml
index 9706e86a94a93885c254b094ec471d6463246a0b..be16d423b2772924394253316990b990320bc07d 100644 (file)
--- a/config/locales/xmf.yml
+++ b/config/locales/xmf.yml
@@ -263,7 +263,6 @@ xmf:
         link: http://wiki.openstreetmap.org/wiki/KA:OpenID
         link text: მუ რე თენა?
       public editing:
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: მუ რე თენა?
         disabled link text: მუშენ ვეშემლებუ რედაქტირაფა?
       contributor terms:
@@ -515,7 +514,7 @@ xmf:
       heading: ქეგუძინაო %{user} მაჸალეთ?
       button: მაჸალეთ გეძინა
       success: '%{name} ასე უკვე თქვანი მაჸალე რე!'
-      already_a_friend: á\83\97á\83¥á\83\95á\83\90 á\83\93á\83\9d %{name} á\83£á\83\99á\83\95á\83\94 á\83\9bá\83\90á\83¸á\83\90á\83\9aá\83\94á\83\94á\83¤á\83\98 á\83\95á\83\9dá\83 á\83\94á\83\97.
+      already_a_friend: თქვა დო %{name} უკვე მაჸალეეფი რეთ.
     remove_friend:
       heading: გეშაბლასათო მაჸალეეფშე %{user}?
       button: მაჸალეეფშე ლასუა

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index ea1b535d917f087ea816ded984db6f8266831019..91f0aab8989a58012102b8823fcdca992a00368b 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -342,7 +342,6 @@ zh-CN:
       public editing:
         heading: 公开编辑
         enabled: 启用。非匿名用户，可以编辑数据。
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: 这是什么？
         disabled: 禁用且无法编辑数据，所有过去的编辑均为匿名。
         disabled link text: 我为什么不能编辑？
@@ -352,7 +351,6 @@ zh-CN:
         not yet agreed: 您还没有同意新的贡献者条款。
         review link text: 请跟随此链接，方便您查看并接受新的贡献者条款。
         agreed_with_pd: 您也将您的编辑释于公有领域。
-        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: 这是什么？
       save changes button: 保存更改
       delete_account: 删除账户

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 6c4b7d10f65bbf456f23e15642747bddb184baa3..9fe6e90a04277f5f27a4ca33a9f795640d882d16 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -309,7 +309,6 @@ zh-TW:
       public editing:
         heading: 公開編輯
         enabled: 已開啟。非匿名且可以編輯資料。
-        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits
         enabled link text: 這是什麼？
         disabled: 已停用且不能編輯資料，所有先前的編輯都會成為匿名的。
         disabled link text: 為什麼我不能編輯？
@@ -319,7 +318,6 @@ zh-TW:
         not yet agreed: 您未同意新的貢獻者條款。
         review link text: 請跟隨此連結，方便你檢視並接受新的貢獻者條款。
         agreed_with_pd: 您亦同意將您的編輯放到公共領域
-        link: https://wiki.osmfoundation.org/wiki/Licence/Contributor_Terms
         link text: 這是什麼？
       save changes button: 儲存變更
       delete_account: 刪除帳號…