Localisation updates from https://translatewiki.net.

diff --git a/config/locales/br.yml b/config/locales/br.yml
index 5d848b72b60ec56a296cb156f9361c13d3d0d0f1..ff8c3b1a84930a86240363f598bf64cb95907837 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -1,6 +1,7 @@
 # Messages for Breton (brezhoneg)
 # Exported from translatewiki.net
 # Export driver: phpyaml
 # Messages for Breton (brezhoneg)
 # Exported from translatewiki.net
 # Export driver: phpyaml

+# Author: Dishual

 # Author: Fohanno
 # Author: Fulup
 # Author: Gwenn-Ael
 # Author: Fohanno
 # Author: Fulup
 # Author: Gwenn-Ael


@@ -393,7 +394,7 @@ br:
         osm_nominatim: Disoc'hoù diwar <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames: Disoc'hoù diwar <a href="http://www.geonames.org/">GeoNames</a>
         osm_nominatim: Disoc'hoù diwar <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames: Disoc'hoù diwar <a href="http://www.geonames.org/">GeoNames</a>

-        osm_nominatim_reverse: Disoc'hoù diwar <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim_reverse: Disoc'hoù diwar <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a>
         geonames_reverse: Disoc'hoù diwar <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
           Nominatim</a>
         geonames_reverse: Disoc'hoù diwar <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:


@@ -1887,6 +1888,7 @@ br:
       terms declined: Un druez eo deomp gwelet hoc'h eus nac'het degemer Termenoù
         ar berzhidi nevez. Evit muioc'h a ditouroù, sellit ouzh <a href="%{url}">ar
         bajenn wiki-mañ</a>.
       terms declined: Un druez eo deomp gwelet hoc'h eus nac'het degemer Termenoù
         ar berzhidi nevez. Evit muioc'h a ditouroù, sellit ouzh <a href="%{url}">ar
         bajenn wiki-mañ</a>.

+      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: Diferadennoù ar c'henlabourer
       heading: Diferadennoù ar c'henlabourer
     terms:
       title: Diferadennoù ar c'henlabourer
       heading: Diferadennoù ar c'henlabourer

diff --git a/config/locales/de.yml b/config/locales/de.yml
index 56648a3e42cc26ecf18e495734444543747e3cb7..d45b5770e7ed0f46a228e7d9cf19a5b0753aa976 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -392,7 +392,7 @@ de:
       embeddable_html: HTML zum Einbinden
       licence: Lizenz
       export_details: Die von OpenStreetMap zur Verfügung gestellten Daten sind unter
       embeddable_html: HTML zum Einbinden
       licence: Lizenz
       export_details: Die von OpenStreetMap zur Verfügung gestellten Daten sind unter

-        der <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons
+        der <a href="https://opendatacommons.org/licenses/odbl/1.0/">Open Data Commons

         Open Database Lizenz</a> (ODbL) lizenziert.
       too_large:
         advice: 'Falls der obenstehende Export fehlschlägt, erwäge bitte, eine der
         Open Database Lizenz</a> (ODbL) lizenziert.
       too_large:
         advice: 'Falls der obenstehende Export fehlschlägt, erwäge bitte, eine der


@@ -432,14 +432,14 @@ de:
   geocoder:
     search:
       title:
   geocoder:
     search:
       title:

-        latlon: Suchergebnisse von <a href="http://openstreetmap.org/">Internal</a>
+        latlon: Suchergebnisse von <a href="https://openstreetmap.org/">Internal</a>

         uk_postcode: Suchergebnisse von <a href="http://www.npemap.org.uk/">NPEMap
           / FreeThe Postcode</a>
         uk_postcode: Suchergebnisse von <a href="http://www.npemap.org.uk/">NPEMap
           / FreeThe Postcode</a>

-        ca_postcode: Suchergebnisse von <a href="http://geocoder.ca/">Geocoder.CA</a>
-        osm_nominatim: Ergebnisse von <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        ca_postcode: Suchergebnisse von <a href="https://geocoder.ca/">Geocoder.CA</a>
+        osm_nominatim: Ergebnisse von <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a>
         geonames: Suchergebnisse von <a href="http://www.geonames.org/">GeoNames</a>
           Nominatim</a>
         geonames: Suchergebnisse von <a href="http://www.geonames.org/">GeoNames</a>

-        osm_nominatim_reverse: Ergebnisse von <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim_reverse: Ergebnisse von <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a>
         geonames_reverse: Ergebnisse von <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
           Nominatim</a>
         geonames_reverse: Ergebnisse von <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:


@@ -962,7 +962,7 @@ de:
         level10: Nachbarschaftsgrenze
     description:
       title:
         level10: Nachbarschaftsgrenze
     description:
       title:

-        osm_nominatim: Lage von <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim: Lage von <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a>
         geonames: Lage von <a href="http://www.geonames.org/">GeoNames</a>
       types:
           Nominatim</a>
         geonames: Lage von <a href="http://www.geonames.org/">GeoNames</a>
       types:


@@ -1043,8 +1043,8 @@ de:
       title_html: Urheberrecht und Lizenz
       intro_1_html: |-
         OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> sind <i>„Open Data“</i>, die gemäß der
       title_html: Urheberrecht und Lizenz
       intro_1_html: |-
         OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> sind <i>„Open Data“</i>, die gemäß der

-        <a href="http://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database Lizenz</a>
-        (ODbL) durch die <a href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF) verfügbar sind.
+        <a href="https://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database Lizenz</a>
+        (ODbL) durch die <a href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF) verfügbar sind.

       intro_2_html: |-
         Es steht dir frei unsere Daten zu kopieren, weiterzugeben,
         zu übermitteln sowie anzupassen, sofern du OpenStreetMap
       intro_2_html: |-
         Es steht dir frei unsere Daten zu kopieren, weiterzugeben,
         zu übermitteln sowie anzupassen, sofern du OpenStreetMap


@@ -1053,10 +1053,10 @@ de:
         als Grundlage für weitere Bearbeitungen verwendest, kannst
         du das Ergebnis auch nur gemäß der selben Lizenz weitergeben.
         Der vollständige Lizenztext ist unter
         als Grundlage für weitere Bearbeitungen verwendest, kannst
         du das Ergebnis auch nur gemäß der selben Lizenz weitergeben.
         Der vollständige Lizenztext ist unter

-        <a href="http://opendatacommons.org/licenses/odbl/1.0/">Lizenz</a>
+        <a href="https://opendatacommons.org/licenses/odbl/1.0/">Lizenz</a>

         einsehbar und erläutert deine Rechte und Pflichten.
       intro_3_html: Die Kartografie in unseren Kartenkacheln und unsere Dokumentation
         einsehbar und erläutert deine Rechte und Pflichten.
       intro_3_html: Die Kartografie in unseren Kartenkacheln und unsere Dokumentation

-        sind unter der ''Creative-Commons''-Lizenz <a href="http://creativecommons.org/licenses/by-sa/2.0/">„Namensnennung
+        sind unter der ''Creative-Commons''-Lizenz <a href="https://creativecommons.org/licenses/by-sa/2.0/">„Namensnennung

         – Weitergabe unter gleichen Bedingungen“ 2.0</a> (CC BY-SA) verfügbar.
       credit_title_html: Wie auf die Urheberschaft von OpenStreetMap hinzuweisen ist
       credit_1_html: Wir verlangen die Verwendung des Hinweises „&copy; OpenStreetMap-Mitwirkende“.
         – Weitergabe unter gleichen Bedingungen“ 2.0</a> (CC BY-SA) verfügbar.
       credit_title_html: Wie auf die Urheberschaft von OpenStreetMap hinzuweisen ist
       credit_1_html: Wir verlangen die Verwendung des Hinweises „&copy; OpenStreetMap-Mitwirkende“.


@@ -1064,7 +1064,7 @@ de:
         Du musst auch klarstellen, dass die Daten unter der Open-Database-Lizenz
         verfügbar sind, und, sofern du unsere Kartenkacheln verwendest, dass die
         Kartografie gemäß CC BY-SA lizenziert ist. Du kannst dies tun, indem du auf
         Du musst auch klarstellen, dass die Daten unter der Open-Database-Lizenz
         verfügbar sind, und, sofern du unsere Kartenkacheln verwendest, dass die
         Kartografie gemäß CC BY-SA lizenziert ist. Du kannst dies tun, indem du auf

-        <a href="http://www.openstreetmap.org/copyright">www.openstreetmap.org/copyright</a> verlinkst.
+        <a href="https://www.openstreetmap.org/copyright">www.openstreetmap.org/copyright</a> verlinkst.

         Ersatzweise, und als Erfordernis, falls du OSM in Datenform weitergibst,
         kannst du die Lizenz(en) direkt verlinken und benennen. In Medien, in denen
         keine Links möglich sind (z.B. gedruckten Werken), empfehlen wir dir,
         Ersatzweise, und als Erfordernis, falls du OSM in Datenform weitergibst,
         kannst du die Lizenz(en) direkt verlinken und benennen. In Medien, in denen
         keine Links möglich sind (z.B. gedruckten Werken), empfehlen wir dir,


@@ -1080,7 +1080,7 @@ de:
       more_title_html: Weitere Informationen
       more_1_html: |-
         Mehr Informationen dazu, wie unsere Daten verwendet werden können und wie man auf unsere Urheberschaft hinweist,
       more_title_html: Weitere Informationen
       more_1_html: |-
         Mehr Informationen dazu, wie unsere Daten verwendet werden können und wie man auf unsere Urheberschaft hinweist,

-        kann man auf unserer <a href="http://osmfoundation.org/Licence">OSMF-Lizenzseite</a> nachlesen.
+        kann man auf unserer <a href="https://osmfoundation.org/Licence">OSMF-Lizenzseite</a> nachlesen.

       more_2_html: |-
         Obwohl OpenStreetMap „Open Data“ ist, können wir keine
         unentgeltliche Karten-API für Drittparteien bereitstellen.
       more_2_html: |-
         Obwohl OpenStreetMap „Open Data“ ist, können wir keine
         unentgeltliche Karten-API für Drittparteien bereitstellen.


@@ -1091,10 +1091,10 @@ de:
       contributors_intro_html: 'Unsere Mitwirkenden sind tausende einzelne Menschen.
         Wir beziehen auch offen lizenzierte Daten von nationalen Kartenagenturen und
         anderen Quellen ein, darunter:'
       contributors_intro_html: 'Unsere Mitwirkenden sind tausende einzelne Menschen.
         Wir beziehen auch offen lizenzierte Daten von nationalen Kartenagenturen und
         anderen Quellen ein, darunter:'

-      contributors_at_html: '<strong>Österreich</strong>: Enthält Daten der <a href="http://data.wien.gv.at/">Stadt
-        Wien</a> (lizenziert gemäß <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC
-        BY AT</a>), des <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Landes
-        Vorarlberg</a> und des Landes Tirol (<a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">lizenziert
+      contributors_at_html: '<strong>Österreich</strong>: Enthält Daten der <a href="https://data.wien.gv.at/">Stadt
+        Wien</a> (lizenziert gemäß <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC
+        BY AT</a>), des <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Landes
+        Vorarlberg</a> und des Landes Tirol (<a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">lizenziert

         gemäß CC BY AT samt Erweiterungen zur Lizenz</a>).'
       contributors_ca_html: '<strong>Kanada</strong>: Enthält Daten von GeoBase&reg;,
         GeoGratis (&copy; <i>Department of Natural Resources Canada</i>), CanVec (&copy;
         gemäß CC BY AT samt Erweiterungen zur Lizenz</a>).'
       contributors_ca_html: '<strong>Kanada</strong>: Enthält Daten von GeoBase&reg;,
         GeoGratis (&copy; <i>Department of Natural Resources Canada</i>), CanVec (&copy;


@@ -1104,11 +1104,11 @@ de:
         <strong>Finnland</strong>: Enthält Daten von der
         topografischen Datenbank der National Land Survey of Finland
         und andere Datensätze, unter der
         <strong>Finnland</strong>: Enthält Daten von der
         topografischen Datenbank der National Land Survey of Finland
         und andere Datensätze, unter der

-        <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI-Lizenz</a>.
+        <a href="https://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI-Lizenz</a>.

       contributors_fr_html: '<strong>Frankreich</strong>: Enthält Daten der <i>Direction
         Générale des Impôts</i>.'
       contributors_nl_html: '<strong>Niederlande</strong>: Enthält, &copy; AND-Daten,
       contributors_fr_html: '<strong>Frankreich</strong>: Enthält Daten der <i>Direction
         Générale des Impôts</i>.'
       contributors_nl_html: '<strong>Niederlande</strong>: Enthält, &copy; AND-Daten,

-        2007 (<a href="http://www.and.com">www.and.com</a>)'
+        2007 (<a href="https://www.and.com">www.and.com</a>)'

       contributors_nz_html: '<strong>Neuseeland</strong>: Enthält Daten aus <i>Land
         Information New Zealand</i>. Urheberrecht vorbehalten.'
       contributors_si_html: |-
       contributors_nz_html: '<strong>Neuseeland</strong>: Enthält Daten aus <i>Land
         Information New Zealand</i>. Urheberrecht vorbehalten.'
       contributors_si_html: |-


@@ -1122,7 +1122,7 @@ de:
       contributors_gb_html: '<strong>Vereinigtes Königreich</strong>: Enthält Daten
         des <i>Ordnance Survey</i> &copy; Urheber- und Datenbankrecht 2010-12.'
       contributors_footer_1_html: Weitere Informationen sowie andere Datenquellen,
       contributors_gb_html: '<strong>Vereinigtes Königreich</strong>: Enthält Daten
         des <i>Ordnance Survey</i> &copy; Urheber- und Datenbankrecht 2010-12.'
       contributors_footer_1_html: Weitere Informationen sowie andere Datenquellen,

-        die zur Verbesserung von OpenStreetMap genutzt wurden, sind auf <a  href="http://wiki.openstreetmap.org/wiki/Contributors">der
+        die zur Verbesserung von OpenStreetMap genutzt wurden, sind auf <a  href="https://wiki.openstreetmap.org/wiki/Contributors">der

         Seite über die Mitwirkenden</a> im Wiki von OpenStreetMap zu finden.
       contributors_footer_2_html: Die Einbeziehung von Daten bei OpenStreetMap bedeutet
         nicht, dass der ursprüngliche Datenlieferant OpenStreetMap unterstützt, Gewährleistung
         Seite über die Mitwirkenden</a> im Wiki von OpenStreetMap zu finden.
       contributors_footer_2_html: Die Einbeziehung von Daten bei OpenStreetMap bedeutet
         nicht, dass der ursprüngliche Datenlieferant OpenStreetMap unterstützt, Gewährleistung


@@ -1135,13 +1135,13 @@ de:
       infringement_2_html: |-
         Sofern du denkst, dass urheberrechtlich geschütztes Material unerlaubterweise zur
         OpenStreetMap-Datenbank oder auf dieser Website hinzugefügt wurde, informiere dich
       infringement_2_html: |-
         Sofern du denkst, dass urheberrechtlich geschütztes Material unerlaubterweise zur
         OpenStreetMap-Datenbank oder auf dieser Website hinzugefügt wurde, informiere dich

-        bitte über unser <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">Verfahren
+        bitte über unser <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">Verfahren

         zum Entfernen von Inhalten</a> oder melde dies direkt mit unserem
         <a href="http://dmca.openstreetmap.org/">Onlineformular</a>.
       trademarks_title_html: <span id="trademarks"></span>Markenzeichen
       trademarks_1_html: OpenStreetMap, das Lupenlogo und „State of the Map“ sind
         eingetragene Warenzeichen der OpenStreetMap Foundation. Falls du Fragen über
         zum Entfernen von Inhalten</a> oder melde dies direkt mit unserem
         <a href="http://dmca.openstreetmap.org/">Onlineformular</a>.
       trademarks_title_html: <span id="trademarks"></span>Markenzeichen
       trademarks_1_html: OpenStreetMap, das Lupenlogo und „State of the Map“ sind
         eingetragene Warenzeichen der OpenStreetMap Foundation. Falls du Fragen über

-        deine Verwendung der Marken hast, sende deine Fragen bitte an die <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Lizenz-Arbeitsgruppe</a>.
+        deine Verwendung der Marken hast, sende deine Fragen bitte an die <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Lizenz-Arbeitsgruppe</a>.

   welcome_page:
     title: Willkommen!
     introduction_html: |-
   welcome_page:
     title: Willkommen!
     introduction_html: |-


@@ -1175,8 +1175,8 @@ de:
       paragraph_1_html: "OpenStreetMap hat nur wenige formale Regeln, aber wir erwarten,
         dass alle Teilnehmer\nmit der Gemeinschaft zusammenarbeiten und kommunizieren.
         Falls du andere Aktivitäten erwägst\nals per Hand zu bearbeiten, lies und
       paragraph_1_html: "OpenStreetMap hat nur wenige formale Regeln, aber wir erwarten,
         dass alle Teilnehmer\nmit der Gemeinschaft zusammenarbeiten und kommunizieren.
         Falls du andere Aktivitäten erwägst\nals per Hand zu bearbeiten, lies und

-        folge bitte den Richtlinien zu\n<a href=\"http://wiki.openstreetmap.org/wiki/DE:Import/Guidelines\">Importen</a>
-        und \n<a href=\"http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct\">automatischen
+        folge bitte den Richtlinien zu\n<a href=\"https://wiki.openstreetmap.org/wiki/DE:Import/Guidelines\">Importen</a>
+        und \n<a href=\"https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct\">automatischen

         Bearbeitungen</a>."
     questions:
       title: Fragen?
         Bearbeitungen</a>."
     questions:
       title: Fragen?


@@ -1213,7 +1213,7 @@ de:
       explanation_html: |-
         Falls du Bedenken über die Verwendung unserer Daten oder über die Inhalte hast, lies bitte unsere
         <a href="/copyright">Copyright-Seite</a> für mehr rechtliche Informationen oder kontaktiere die entsprechende
       explanation_html: |-
         Falls du Bedenken über die Verwendung unserer Daten oder über die Inhalte hast, lies bitte unsere
         <a href="/copyright">Copyright-Seite</a> für mehr rechtliche Informationen oder kontaktiere die entsprechende

-        <a href="http://wiki.osmfoundation.org/wiki/Working_Groups">OSMF-Arbeitsgruppe</a>.
+        <a href="https://wiki.osmfoundation.org/wiki/Working_Groups">OSMF-Arbeitsgruppe</a>.

   help_page:
     title: Hilfe erhalten
     introduction: |-
   help_page:
     title: Hilfe erhalten
     introduction: |-


@@ -1225,7 +1225,7 @@ de:
       description: Beginne mit dieser Schnellanleitung, die die OpenStreetMap-Grundlagen
         abdeckt.
     beginners_guide:
       description: Beginne mit dieser Schnellanleitung, die die OpenStreetMap-Grundlagen
         abdeckt.
     beginners_guide:

-      url: http://wiki.openstreetmap.org/wiki/DE:Beginners%27_guide
+      url: https://wiki.openstreetmap.org/wiki/DE:Beginners%27_guide

       title: Anleitung für Anfänger
       description: Eine durch die Gemeinschaft gewartete Anleitung für Anfänger.
     help:
       title: Anleitung für Anfänger
       description: Eine durch die Gemeinschaft gewartete Anleitung für Anfänger.
     help:


@@ -1249,7 +1249,7 @@ de:
       description: Hilfe für auf Karten und anderen Diensten gegründeten Unternehmen
         und Organisationen, die zu OpenStreetMap wechseln.
     wiki:
       description: Hilfe für auf Karten und anderen Diensten gegründeten Unternehmen
         und Organisationen, die zu OpenStreetMap wechseln.
     wiki:

-      url: http://wiki.openstreetmap.org/
+      url: https://wiki.openstreetmap.org/

       title: wiki.openstreetmap.org
       description: Durchsuche das Wiki für eine ausführliche OSM-Dokumentation.
   about_page:
       title: wiki.openstreetmap.org
       description: Durchsuche das Wiki für eine ausführliche OSM-Dokumentation.
   about_page:


@@ -1273,8 +1273,8 @@ de:
       Um mehr über die Gemeinschaft zu erfahren, lies unseren
       <a href='https://blog.openstreetmap.org'>OpenStreetMap-Blog</a>,
       die <a href='%{diary_path}'>Benutzertagebücher</a>,
       Um mehr über die Gemeinschaft zu erfahren, lies unseren
       <a href='https://blog.openstreetmap.org'>OpenStreetMap-Blog</a>,
       die <a href='%{diary_path}'>Benutzertagebücher</a>,

-      <a href='http://blogs.openstreetmap.org/'>Community-Blogs</a> und die Website der
-      <a href='http://www.osmfoundation.org/'>OSM-Foundation</a>.
+      <a href='https://blogs.openstreetmap.org/'>Community-Blogs</a> und die Website der
+      <a href='https://www.osmfoundation.org/'>OSM-Foundation</a>.

     open_data_title: Open Data
     open_data_html: |-
       OpenStreetMap ist „<i>Open Data</i>“: Du kannst es für jeden Zweck verwenden,
     open_data_title: Open Data
     open_data_html: |-
       OpenStreetMap ist „<i>Open Data</i>“: Du kannst es für jeden Zweck verwenden,


@@ -1285,13 +1285,13 @@ de:
     legal_title: Rechtliche Hinweise
     legal_html: |-
       Diese Website und viele damit in Zusammenhang stehende Dienste werden
     legal_title: Rechtliche Hinweise
     legal_html: |-
       Diese Website und viele damit in Zusammenhang stehende Dienste werden

-      von der <a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
+      von der <a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)

       für die OSM-Gemeinschaft betrieben. Die Verwendung aller OSMF-betriebenen Dienste
       ist Thema unserer
       für die OSM-Gemeinschaft betrieben. Die Verwendung aller OSMF-betriebenen Dienste
       ist Thema unserer

-      „<a href="http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">Acceptable Use Policies</a>“
-      und unserer <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy">Datenschutzrichtlinie</a>.
+      „<a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">Acceptable Use Policies</a>“
+      und unserer <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Datenschutzrichtlinie</a>.

       <br>
       <br>

-      Bitte <a href='http://osmfoundation.org/Contact'>kontaktiere die OSMF</a>,
+      Bitte <a href='https://osmfoundation.org/Contact'>kontaktiere die OSMF</a>,

       falls du Lizenz-, Urheberrechts- oder andere rechtliche Fragen und Probleme hast.
     partners_title: Partner
   notifier:
       falls du Lizenz-, Urheberrechts- oder andere rechtliche Fragen und Probleme hast.
     partners_title: Partner
   notifier:


@@ -1512,15 +1512,15 @@ de:
       user_page_link: Einstellungsseite
       anon_edits_link_text: Hier findest du mehr Infos dazu.
       flash_player_required: Du benötigst den Flash Player um Potlatch, den OpenStreetMap-Flash-Editor,
       user_page_link: Einstellungsseite
       anon_edits_link_text: Hier findest du mehr Infos dazu.
       flash_player_required: Du benötigst den Flash Player um Potlatch, den OpenStreetMap-Flash-Editor,

-        zu benutzen. <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">Lade
-        den Flash Player von Adobe.com herunter</a>. <a href="http://wiki.openstreetmap.org/wiki/DE:Editing">Einige
+        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
         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

-        http://wiki.openstreetmap.org/wiki/The_Rails_Port
+        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
       potlatch2_unsaved_changes: Es gibt ungesicherte Änderungen. (Du solltest in
         Potlatch 2 „speichern“ klicken.)
       id_not_configured: iD wurde nicht konfiguriert


@@ -1612,7 +1612,7 @@ de:
       edit: Bearbeiten
       preview: Vorschau
     markdown_help:
       edit: Bearbeiten
       preview: Vorschau
     markdown_help:

-      title_html: Interpretiert mit <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
+      title_html: Interpretiert mit <a href="https://daringfireball.net/projects/markdown/">Markdown</a>

       headings: Überschriften
       heading: Überschrift
       subheading: Zwischenüberschrift
       headings: Überschriften
       heading: Überschrift
       subheading: Zwischenüberschrift


@@ -1724,7 +1724,7 @@ de:
       description: Letzte GPS-Track-Uploads durchsuchen
       tagged_with: ' gekennzeichnet mit %{tags}'
       empty_html: Noch keine GPS-Tracks vorhanden. <a href='%{upload_link}'>Lade einen
       description: Letzte GPS-Track-Uploads durchsuchen
       tagged_with: ' gekennzeichnet mit %{tags}'
       empty_html: Noch keine GPS-Tracks vorhanden. <a href='%{upload_link}'>Lade einen

-        neuen Track hoch</a> oder informiere dich auf folgender <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>Wikiseite</a>
+        neuen Track hoch</a> oder informiere dich auf folgender <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>Wikiseite</a>

         über das Aufzeichnen von GPS-Tracks.
     delete:
       scheduled_for_deletion: Für die Löschung vorgesehener Track
         über das Aufzeichnen von GPS-Tracks.
     delete:
       scheduled_for_deletion: Für die Löschung vorgesehener Track


@@ -1940,12 +1940,12 @@ de:
           Jeder kann sie verbessern, aktualisieren und erweitern, sowie für jeden Zweck verwenden.</p>
           <p>Melde dich an und mache mit. Zur Bestätigung wird eine E-Mail an die angegebene Adresse geschickt werden, bitte gehe wie darin beschrieben vor.</p>
       license_agreement: Wenn du dein Benutzerkonto bestätigst, musst du auch den
           Jeder kann sie verbessern, aktualisieren und erweitern, sowie für jeden Zweck verwenden.</p>
           <p>Melde dich an und mache mit. Zur Bestätigung wird eine E-Mail an die angegebene Adresse geschickt werden, bitte gehe wie darin beschrieben vor.</p>
       license_agreement: Wenn du dein Benutzerkonto bestätigst, musst du auch den

-        <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">Bedingungen
+        <a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">Bedingungen

         für Mitwirkende</a> zustimmen.
       email address: 'E-Mail-Adresse:'
       confirm email address: 'Bitte wiederhole die E-Mail-Adresse:'
       not displayed publicly: Deine Anrede wird nicht öffentlich angezeigt, siehe
         für Mitwirkende</a> zustimmen.
       email address: 'E-Mail-Adresse:'
       confirm email address: 'Bitte wiederhole die E-Mail-Adresse:'
       not displayed publicly: Deine Anrede wird nicht öffentlich angezeigt, siehe

-        unsere <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF-Datenschutzrichtlinie
+        unsere <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF-Datenschutzrichtlinie

         inklusive des Abschnitts zu E-Mail-Adressen">Datenschutzrichtlinie</a> für
         weitere Informationen.
       display name: 'Benutzername:'
         inklusive des Abschnitts zu E-Mail-Adressen">Datenschutzrichtlinie</a> für
         weitere Informationen.
       display name: 'Benutzername:'


@@ -2069,12 +2069,12 @@ de:
       email never displayed publicly: (nicht öffentlich sichtbar)
       external auth: 'Externe Authentifikation:'
       openid:
       email never displayed publicly: (nicht öffentlich sichtbar)
       external auth: 'Externe Authentifikation:'
       openid:

-        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link: https://wiki.openstreetmap.org/wiki/OpenID

         link text: Was ist das?
       public editing:
         heading: 'Karte bearbeiten (public editing):'
         enabled: Aktiviert. Normales Bearbeiten der Kartendaten ist möglich.
         link text: Was ist das?
       public editing:
         heading: 'Karte bearbeiten (public editing):'
         enabled: Aktiviert. Normales Bearbeiten der Kartendaten ist möglich.

-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        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.
         enabled link text: Was bedeutet das?
         disabled: Deaktiviert. Das Bearbeiten von Kartendaten NICHT möglich, alle
           bisherigen Bearbeitungen sind anonym.


@@ -2085,7 +2085,7 @@ de:
           senden noch deinen Wohnort sehen. Um sichtbar zu machen, welche Arbeit von
           dir stammt, und um kontaktierbar zu werden, klicke auf den Button unten.
           <b>Seit Version 0.6 der API aktiv ist, können unangemeldete Benutzer die
           senden noch deinen Wohnort sehen. Um sichtbar zu machen, welche Arbeit von
           dir stammt, und um kontaktierbar zu werden, klicke auf den Button unten.
           <b>Seit Version 0.6 der API aktiv ist, können unangemeldete Benutzer die

-          Karte nicht mehr bearbeiten</b> (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">Warum?</a>).<ul><li>Deine
+          Karte nicht mehr bearbeiten</b> (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">Warum?</a>).<ul><li>Deine

           E-Mail-Adresse wird bei Verlassen des anonymen Status nicht veröffentlicht.</li><li>Die
           Aktion kann nicht rückgängig gemacht werden. Für neu registrierte Benutzer
           besteht die Möglichkeit des anonymen Benutzerkontos nicht mehr.</li></ul>
           E-Mail-Adresse wird bei Verlassen des anonymen Status nicht veröffentlicht.</li><li>Die
           Aktion kann nicht rückgängig gemacht werden. Für neu registrierte Benutzer
           besteht die Möglichkeit des anonymen Benutzerkontos nicht mehr.</li></ul>

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 24428de1e72e8461f274610a0c44e104c0f6be7e..e45af6361d1c41e44265a0d1b5cf427b90d7ecf1 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -21,6 +21,7 @@
 # Author: Johnarupire
 # Author: Jynus
 # Author: KATRINE1992
 # Author: Johnarupire
 # Author: Jynus
 # Author: KATRINE1992

+# Author: La Mantis

 # Author: Larjona
 # Author: Locos epraix
 # Author: Luzcaru
 # Author: Larjona
 # Author: Locos epraix
 # Author: Luzcaru


@@ -423,14 +424,14 @@ es:
   geocoder:
     search:
       title:
   geocoder:
     search:
       title:

-        latlon: Resultados <a href="http://openstreetmap.org/">internos</a>
+        latlon: Resultados <a href="https://openstreetmap.org/">internos</a>

         uk_postcode: Resultados de <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
           Postcode</a>
         uk_postcode: Resultados de <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
           Postcode</a>

-        ca_postcode: Resultados de <a href="http://geocoder.ca/">Geocoder.CA</a>
-        osm_nominatim: Resultados de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        ca_postcode: Resultados de <a href="https://geocoder.ca/">Geocoder.CA</a>
+        osm_nominatim: Resultados de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a>
         geonames: Resultados de <a href="http://www.geonames.org/">GeoNames</a>
           Nominatim</a>
         geonames: Resultados de <a href="http://www.geonames.org/">GeoNames</a>

-        osm_nominatim_reverse: Resultados de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim_reverse: Resultados de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a>
         geonames_reverse: Resultados de <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
           Nominatim</a>
         geonames_reverse: Resultados de <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:


@@ -1029,24 +1030,23 @@ es:
       title_html: Derechos de autor y licencia
       intro_1_html: |-
         OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> es <i>Open Data</i> (un servicio de datos de acceso libre), con licencia <a
       title_html: Derechos de autor y licencia
       intro_1_html: |-
         OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> es <i>Open Data</i> (un servicio de datos de acceso libre), con licencia <a

-        href="http://opendatacommons.org/licenses/odbl/">Open Data
+        href="https://opendatacommons.org/licenses/odbl/">Open Data

         Commons Open Database License</a> (ODbL) de la  <a
         Commons Open Database License</a> (ODbL) de la  <a

-        href="http://osmfoundation.org/">Fundación OpenStreetMap</a> (OSMF).
+        href="https://osmfoundation.org/">Fundación OpenStreetMap</a> (OSMF).

       intro_2_html: Puedes copiar, distribuir, transmitir y adaptar nuestros mapas
         e información libremente siempre y cuando des reconocimiento a OpenStreetMap
         y sus colaboradores. Si alteras o generas contenido sobre nuestros mapas e
         información, solo podrás distribuir estos cambios bajo la misma licencia.
       intro_2_html: Puedes copiar, distribuir, transmitir y adaptar nuestros mapas
         e información libremente siempre y cuando des reconocimiento a OpenStreetMap
         y sus colaboradores. Si alteras o generas contenido sobre nuestros mapas e
         información, solo podrás distribuir estos cambios bajo la misma licencia.

-        El <a href="http://opendatacommons.org/licenses/odbl/1.0/">código legal completo</a>
+        El <a href="https://opendatacommons.org/licenses/odbl/1.0/">código legal completo</a>

         explica tus derechos y obligaciones.
       intro_3_html: La cartografía en nuestros mosaicos de mapas y en nuestra documentación,
         explica tus derechos y obligaciones.
       intro_3_html: La cartografía en nuestros mosaicos de mapas y en nuestra documentación,

-        están licenciados bajo la licencia <a href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
-        Commons Reconocimiento-CompartirIgual 2.0</a> (CC-BY-SA).
+        están licenciados bajo la licencia <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
+        Commons Reconocimiento-CompartirIgual 2.0</a> (CC BY-SA).

       credit_title_html: Cómo dar reconocimiento a OpenStreetMap
       credit_1_html: Requerimos que utilices los créditos "© Colaboradores de OpenStreetMap".
       credit_2_html: |-
       credit_title_html: Cómo dar reconocimiento a OpenStreetMap
       credit_1_html: Requerimos que utilices los créditos "© Colaboradores de OpenStreetMap".
       credit_2_html: |-

-        Usted debe también dejar claro que los datos están disponibles bajo la licencia Open Database License (ODbL), y si utiliza nuestros mapas, que la cartografía posee licencia CC-BY-SA. Puede hacer esto mediante el enlace a <a href="http://www.openstreetmap.org/copyright">esta página de derechos de autor</a>.
-        Como alternativa y como un requisito si están distribuyendo OSM en un  formulario de datos, puede nombrar y enlazar directamente a las licencias. En medios de comunicación donde los enlaces no sean posibles (por ejemplo, obras impresas), le sugerimos que
-        dirija a sus lectores a openstreetmap.org (quizás expandiendo 'OpenStreetMap' hasta esta dirección completa), a opendatacommons.org, y si procede, a creativecommons.org.
+        Usted debe también dejar claro que los datos están disponibles bajo la licencia Open Database License (ODbL), y si utiliza nuestros mapas, que la cartografía posee licencia CC BY-SA. Puede hacer esto mediante el enlace a <a href="https://www.openstreetmap.org/copyright">esta página de derechos de autor</a>.
+        Como alternativa y como un requisito si están distribuyendo OSM en un formulario de datos, puede nombrar y enlazar directamente a las licencias. En medios de comunicación donde los enlaces no sean posibles (por ejemplo, obras impresas), le sugerimos que dirija a sus lectores a openstreetmap.org (quizás expandiendo 'OpenStreetMap' hasta esta dirección completa), a opendatacommons.org, y si procede, a creativecommons.org.

       credit_3_html: |-
         En un mapa electrónico navegable, los créditos deben aparecer en la esquina del mapa.
         Por ejemplo:
       credit_3_html: |-
         En un mapa electrónico navegable, los créditos deben aparecer en la esquina del mapa.
         Por ejemplo:


@@ -1055,8 +1055,8 @@ es:
         title: Ejemplo de atribución
       more_title_html: Para saber más...
       more_1_html: |-
         title: Ejemplo de atribución
       more_title_html: Para saber más...
       more_1_html: |-

-        Encontrarás más información acerca de cómo utilizar nuestros datos, y cómo citarnos como fuente, en la <a
-        href="http://osmfoundation.org/Licence">página de licencia de OSMF</a> y en las <a href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">preguntas legales más frecuentes</a> de la comunidad.
+        Encontrarás más información acerca de cómo utilizar nuestros datos y cómo citarnos como fuente en la <a
+        href="https://osmfoundation.org/Licence">página de licencia de la OSMF</a>.

       more_2_html: |-
         A pesar de que OpenStreetMap es contenido abierto, no podemos suminstrar una API de mapas gratuita para terceros.
 
       more_2_html: |-
         A pesar de que OpenStreetMap es contenido abierto, no podemos suminstrar una API de mapas gratuita para terceros.
 


@@ -1068,8 +1068,8 @@ es:
         y otras fuentes, entre ellas:'
       contributors_at_html: |-
         <strong>Austria</strong>: Contiene datos de
         y otras fuentes, entre ellas:'
       contributors_at_html: |-
         <strong>Austria</strong>: Contiene datos de

-           <a href="http://data.wien.gv.at/">Stadt Wien</a> (bajo
-           <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>), <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> y Land Tirol (bajo licencia <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT con modificaciones</a>).
+           <a href="https://data.wien.gv.at/">Stadt Wien</a> (bajo
+           <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>), <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> y Land Tirol (bajo licencia <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT con modificaciones</a>).

       contributors_ca_html: '<strong>Canadá</strong>: contiene datos de GeoBase&reg;,
         GeoGratis (&copy; Department of Natural Resources Canada), CanVec (&copy;
         Department of Natural Resources Canada) y StatCan (Geography Division, Statistics
       contributors_ca_html: '<strong>Canadá</strong>: contiene datos de GeoBase&reg;,
         GeoGratis (&copy; Department of Natural Resources Canada), CanVec (&copy;
         Department of Natural Resources Canada) y StatCan (Geography Division, Statistics


@@ -1097,7 +1097,7 @@ es:
         <strong>Reino Unido</strong>: Contiene datos de Ordnance Survey &copy; Crown copyright and database right
          2010-12.
       contributors_footer_1_html: Para obtener más detalles sobre estas y otras fuentes
         <strong>Reino Unido</strong>: Contiene datos de Ordnance Survey &copy; Crown copyright and database right
          2010-12.
       contributors_footer_1_html: Para obtener más detalles sobre estas y otras fuentes

-        que se han utilizado para ayudar a mejorar OpenStreetMap, véase la <a href="http://wiki.openstreetmap.org/wiki/Contributors">página
+        que se han utilizado para ayudar a mejorar OpenStreetMap, véase la <a href="https://wiki.openstreetmap.org/wiki/Contributors">página

         de colaboradores</a> en el Wiki de OpenStreetMap.
       contributors_footer_2_html: La inclusión de información en OpenStreetMap no
         implica que el proveedor de la información original apoya a OpenStreetMap,
         de colaboradores</a> en el Wiki de OpenStreetMap.
       contributors_footer_2_html: La inclusión de información en OpenStreetMap no
         implica que el proveedor de la información original apoya a OpenStreetMap,


@@ -1187,7 +1187,7 @@ es:
       title: Otras preocupaciones
       explanation_html: |-
         Si tienes preocupaciones sobre cómo se están utilizando nuestros datos o sobre el contenido, consulta nuestra
       title: Otras preocupaciones
       explanation_html: |-
         Si tienes preocupaciones sobre cómo se están utilizando nuestros datos o sobre el contenido, consulta nuestra

-        <a href='/copyright'>página de derechos de autor</a> para obtener más información legal, o contacta con el <a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>grupo de trabajo OSMF</a> apropiado.
+        <a href='/copyright'>página de derechos de autor</a> para obtener más información legal, o contacta con el <a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>grupo de trabajo OSMF</a> apropiado.

   help_page:
     title: Cómo obtener ayuda
     introduction: OpenStreetMap tiene varios recursos para aprender sobre el proyecto,
   help_page:
     title: Cómo obtener ayuda
     introduction: OpenStreetMap tiene varios recursos para aprender sobre el proyecto,


@@ -1198,7 +1198,7 @@ es:
       title: Le damos la bienvenida a OSM
       description: Comenzar con esta guía rápida que cubre lo básico de OpenStreetMap.
     beginners_guide:
       title: Le damos la bienvenida a OSM
       description: Comenzar con esta guía rápida que cubre lo básico de OpenStreetMap.
     beginners_guide:

-      url: http://wiki.openstreetmap.org/wiki/ES:Beginners%27_guide
+      url: https://wiki.openstreetmap.org/wiki/ES:Beginners%27_guide

       title: Guía del principiante
       description: Guía para principiantes, mantenida por la comunidad.
     help:
       title: Guía del principiante
       description: Guía para principiantes, mantenida por la comunidad.
     help:


@@ -1222,7 +1222,7 @@ es:
       description: Ayuda para las empresas y organizaciones que migran a mapas y a
         otros servicios, basados en OpenStreetMap.
     wiki:
       description: Ayuda para las empresas y organizaciones que migran a mapas y a
         otros servicios, basados en OpenStreetMap.
     wiki:

-      url: http://wiki.openstreetmap.org/wiki/ES:Main_Page
+      url: https://wiki.openstreetmap.org/wiki/ES:Main_Page

       title: wiki.openstreetmap.org
       description: Explora el wiki para obtener documentación detallada de OSM.
   about_page:
       title: wiki.openstreetmap.org
       description: Explora el wiki para obtener documentación detallada de OSM.
   about_page:


@@ -1572,7 +1572,7 @@ es:
       edit: Editar
       preview: Vista previa
     markdown_help:
       edit: Editar
       preview: Vista previa
     markdown_help:

-      title_html: Analizado con <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
+      title_html: Procesado con <a href="https://daringfireball.net/projects/markdown/">Markdown</a>

       headings: Títulos
       heading: Título
       subheading: Subcabecera
       headings: Títulos
       heading: Título
       subheading: Subcabecera


@@ -1897,7 +1897,7 @@ es:
           por gente como tú, y cualquiera puede corregirlo, actualizarlo, descargarlo
           y usarlo.</p> <p>Regístrate para comenzar a contribuir. Te enviaremos un
           mensaje de correo electrónico para confirmar tu cuenta.</p>
           por gente como tú, y cualquiera puede corregirlo, actualizarlo, descargarlo
           y usarlo.</p> <p>Regístrate para comenzar a contribuir. Te enviaremos un
           mensaje de correo electrónico para confirmar tu cuenta.</p>

-      license_agreement: Cuando confirmes tu cuenta tendrás que aceptar los <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">términos
+      license_agreement: Cuando confirmes tu cuenta tendrás que aceptar los <a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">términos

         del contribuyente</a>.
       email address: 'Dirección de correo electrónico:'
       confirm email address: 'Confirmar la dirección de correo electrónico:'
         del contribuyente</a>.
       email address: 'Dirección de correo electrónico:'
       confirm email address: 'Confirmar la dirección de correo electrónico:'


@@ -2023,7 +2023,7 @@ es:
       email never displayed publicly: (nunca es mostrado públicamente)
       external auth: 'Autenticación externa:'
       openid:
       email never displayed publicly: (nunca es mostrado públicamente)
       external auth: 'Autenticación externa:'
       openid:

-        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link: https://wiki.openstreetmap.org/wiki/OpenID

         link text: ¿qué es esto?
       public editing:
         heading: 'Ediciones públicas:'
         link text: ¿qué es esto?
       public editing:
         heading: 'Ediciones públicas:'

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 29011dc5a301ca769b1be6641ce8116fa4fd0625..1d1677e89d1d97d4812cbb3780ef229d8802d8a3 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -2131,6 +2131,8 @@ eu:
       not_a_role: '''%{role}'' katea ez da baliozko rola.'
       already_has_role: Erabiltzaileak %{role} rola dauka jadanik.
       doesnt_have_role: Erabiltzaileak ez dauka %{role} rolik.
       not_a_role: '''%{role}'' katea ez da baliozko rola.'
       already_has_role: Erabiltzaileak %{role} rola dauka jadanik.
       doesnt_have_role: Erabiltzaileak ez dauka %{role} rolik.

+      not_revoke_admin_current_user: Ezin da administratzaile rola uneko erabiltzaileari
+        errebokatu.

     grant:
       title: Berretsi eginkizuna ematea
       heading: Berretsi eginkizuna ematea
     grant:
       title: Berretsi eginkizuna ematea
       heading: Berretsi eginkizuna ematea

diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 5b6de997cfe5e17eac34b45af65888669cfc5975..aaadb66abf9b7bb28221c8d74c2b46eedda681fe 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -450,7 +450,7 @@ fr:
         osm_nominatim: Résultats de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames: Résultats depuis <a href="http://www.geonames.org/">GeoNames</a>
         osm_nominatim: Résultats de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
           Nominatim</a>
         geonames: Résultats depuis <a href="http://www.geonames.org/">GeoNames</a>

-        osm_nominatim_reverse: Résultats de <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim_reverse: Résultats de <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a>
         geonames_reverse: Résultats de <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
           Nominatim</a>
         geonames_reverse: Résultats de <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:

diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 905e59b4eacc756f8de2882777d6cad90ba9d38e..305f92ac251579006789353866796b88f5c2636a 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -3,6 +3,7 @@
 # Export driver: phpyaml
 # Author: Athoss
 # Author: BanKris
 # Export driver: phpyaml
 # Author: Athoss
 # Author: BanKris

+# Author: Bencemac

 # Author: BáthoryPéter
 # Author: City-busz
 # Author: Csega
 # Author: BáthoryPéter
 # Author: City-busz
 # Author: Csega


@@ -359,7 +360,7 @@ hu:
       map_image: Térkép (Alapértelmezett réteg)
       embeddable_html: Beágyazható HTML
       licence: Licenc
       map_image: Térkép (Alapértelmezett réteg)
       embeddable_html: Beágyazható HTML
       licence: Licenc

-      export_details: Az OpenStreetMap adatokra az <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open
+      export_details: Az OpenStreetMap adatokra az <a href="https://opendatacommons.org/licenses/odbl/1.0/">Open

         Data Commons Open Database licenc </a> vonatkozik. (ODbL)
       too_large:
         advice: Ha a fenti exportálás sikertelen lenne, próbáld meg az alábbi listából
         Data Commons Open Database licenc </a> vonatkozik. (ODbL)
       too_large:
         advice: Ha a fenti exportálás sikertelen lenne, próbáld meg az alábbi listából


@@ -399,14 +400,14 @@ hu:
   geocoder:
     search:
       title:
   geocoder:
     search:
       title:

-        latlon: Eredmények az <a href="http://openstreetmap.org/">Internal</a>ról
+        latlon: Eredmények az <a href="https://openstreetmap.org/">Internal</a>ról

         uk_postcode: Eredmények a <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
           Postcode</a>-ról
         uk_postcode: Eredmények a <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
           Postcode</a>-ról

-        ca_postcode: Eredmények a <a href="http://geocoder.ca/">Geocoder.CA</a>-ről
-        osm_nominatim: Eredmények az <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        ca_postcode: Eredmények a <a href="https://geocoder.ca/">Geocoder.CA</a>-ről
+        osm_nominatim: Eredmények az <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a>tól
         geonames: Eredmények a <a href="http://www.geonames.org/">GeoNames</a>ről
           Nominatim</a>tól
         geonames: Eredmények a <a href="http://www.geonames.org/">GeoNames</a>ről

-        osm_nominatim_reverse: Eredmények az <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim_reverse: Eredmények az <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatimról</a>
         geonames_reverse: Eredmények a <a href="http://www.geonames.org/">GeoNames-ről</a>
     search_osm_nominatim:
           Nominatimról</a>
         geonames_reverse: Eredmények a <a href="http://www.geonames.org/">GeoNames-ről</a>
     search_osm_nominatim:


@@ -929,7 +930,7 @@ hu:
         level10: Városrészhatár
     description:
       title:
         level10: Városrészhatár
     description:
       title:

-        osm_nominatim: Helyek az <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim: Helyek az <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a>tól
         geonames: Helyek a <a href="http://www.geonames.org/">GeoNames</a>ről
       types:
           Nominatim</a>tól
         geonames: Helyek a <a href="http://www.geonames.org/">GeoNames</a>ről
       types:


@@ -1005,24 +1006,24 @@ hu:
       title_html: Szerzői jog és licenc
       intro_1_html: |-
         Az OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> egy <i>szabad adathalmaz</i>, amelyet az <a
       title_html: Szerzői jog és licenc
       intro_1_html: |-
         Az OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> egy <i>szabad adathalmaz</i>, amelyet az <a

-        href="http://opendatacommons.org/licenses/odbl/">Open Data
+        href="https://opendatacommons.org/licenses/odbl/">Open Data

         Commons Open Database License</a> licenc (ODbL) alatt tett közzé az <a
         Commons Open Database License</a> licenc (ODbL) alatt tett közzé az <a

-        href="http://osmfoundation.org/">OpenStreetMap Alapítvány</a> (OSMF).
+        href="https://osmfoundation.org/">OpenStreetMap Alapítvány</a> (OSMF).

       intro_2_html: |2-
           Szabadon másolhatod, terjesztheted, továbbíthatod és átdolgozhatod adatainkat mindaddig, amíg feltünteted az OpenStreetMapot és közreműködőit. Ha módosítod vagy felhasználod az adatainkat, akkor az eredményt is csak azonos licenccel terjesztheted. A teljes <a
       intro_2_html: |2-
           Szabadon másolhatod, terjesztheted, továbbíthatod és átdolgozhatod adatainkat mindaddig, amíg feltünteted az OpenStreetMapot és közreműködőit. Ha módosítod vagy felhasználod az adatainkat, akkor az eredményt is csak azonos licenccel terjesztheted. A teljes <a

-          href="http://opendatacommons.org/licenses/odbl/1.0/">jogi
+          href="https://opendatacommons.org/licenses/odbl/1.0/">jogi

           szabályzat</a> ismerteti a jogaidat és kötelezettségeidet.
       intro_3_html: |2-
            Az OpenStreetMap <i>térképeire</i> a <a
           szabályzat</a> ismerteti a jogaidat és kötelezettségeidet.
       intro_3_html: |2-
            Az OpenStreetMap <i>térképeire</i> a <a

-           href="http://creativecommons.org/licenses/by-sa/2.0/">Creative
+           href="https://creativecommons.org/licenses/by-sa/2.0/">Creative

            Commons Nevezd meg! - Így add tovább! 2.0</a> licenc (CC BY-SA) vonatkozik.
       credit_title_html: Hogyan kell feltüntetned az OpenStreetMapot?
       credit_1_html: Kérjük, hogy forrásként a &ldquo;&copy; OpenStreetMap közreműködők&rdquo;
         szöveget tüntesd fel.
       credit_2_html: Azt is egyértelművé kell tenned, hogy az adatok az Open Database
         Licenc alatt elérhetőek, illetve ha a mi térkép csempéinket használod akkor
            Commons Nevezd meg! - Így add tovább! 2.0</a> licenc (CC BY-SA) vonatkozik.
       credit_title_html: Hogyan kell feltüntetned az OpenStreetMapot?
       credit_1_html: Kérjük, hogy forrásként a &ldquo;&copy; OpenStreetMap közreműködők&rdquo;
         szöveget tüntesd fel.
       credit_2_html: Azt is egyértelművé kell tenned, hogy az adatok az Open Database
         Licenc alatt elérhetőek, illetve ha a mi térkép csempéinket használod akkor

-        azt, hogy a grafikai megjelenítés a CC-BY-SA licenc feltételeivel használható.
-        Ezt megteheted egy erre a <a href="http://www.openstreetmap.org/copyright">copyright
+        azt, hogy a grafikai megjelenítés a CC BY-SA licenc feltételeivel használható.
+        Ezt megteheted egy erre a <a href="https://www.openstreetmap.org/copyright">copyright

         oldalra</a> való hivatkozással. Alternatívaként, ha az OSM-et adatokként terjeszted,
         akkor fel kell tüntetned a nevet és linket közvetlenül a licencre. Ha a formátum
         a linkelést nem teszi lehetővé (pl. nyomtatásban), javasoljuk, hogy a felhasználókat
         oldalra</a> való hivatkozással. Alternatívaként, ha az OSM-et adatokként terjeszted,
         akkor fel kell tüntetned a nevet és linket közvetlenül a licencre. Ha a formátum
         a linkelést nem teszi lehetővé (pl. nyomtatásban), javasoljuk, hogy a felhasználókat


@@ -1039,7 +1040,7 @@ hu:
       more_title_html: Tudj meg többet!
       more_1_html: |-
         További információ adataink használatáról az <a
       more_title_html: Tudj meg többet!
       more_1_html: |-
         További információ adataink használatáról az <a

-        href="http://osmfoundation.org/License">OSMF Licenc lapon</a>.
+        href="https://osmfoundation.org/License">OSMF Licenc lapon</a>.

       more_2_html: |-
         Habár az OpenStreetMap egy nyílt adatforrás, nem tudunk ingyenes térkép API elérést biztosítani a harmadik feleknek.
 
       more_2_html: |-
         Habár az OpenStreetMap egy nyílt adatforrás, nem tudunk ingyenes térkép API elérést biztosítani a harmadik feleknek.
 


@@ -1050,24 +1051,24 @@ hu:
         többek között:'
       contributors_at_html: |-
         <strong>Ausztria</strong>: adatokat tartalmaz a következő forrásból:
         többek között:'
       contributors_at_html: |-
         <strong>Ausztria</strong>: adatokat tartalmaz a következő forrásból:

-           <a href="http://data.wien.gv.at/">Bécs városa</a>
-           <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a> licenc alatt.
+           <a href="https://data.wien.gv.at/">Bécs városa</a>
+           <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a> licenc alatt.

       contributors_ca_html: |-
         <strong>Kanada</strong>: adatokat tartalmaz a következő forrásokból:
            GeoBase&reg;, GeoGratis (&copy; Department of Natural
            Resources Canada), CanVec (&copy; Department of Natural
            Resources Canada), and StatCan (Geography Division,
            Statistics Canada).
       contributors_ca_html: |-
         <strong>Kanada</strong>: adatokat tartalmaz a következő forrásokból:
            GeoBase&reg;, GeoGratis (&copy; Department of Natural
            Resources Canada), CanVec (&copy; Department of Natural
            Resources Canada), and StatCan (Geography Division,
            Statistics Canada).

-      contributors_fi_html: "<strong>Finnország</strong>: Adatokat tartalmaz akövetkező
+      contributors_fi_html: "<strong>Finnország</strong>: Adatokat tartalmaz a következő

         forrásokból: \nNational Land Survey of Finland's Topographic Database\nés
         forrásokból: \nNational Land Survey of Finland's Topographic Database\nés

-        más adatforrások a  href=\"http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501\">NLSFI
-        License</a> alatt."
+        más adatforrások <a href=\"https://www.maanmittauslaitos.fi/en/opendata-licence-version1\"></a>NLSFI
+        licenc alatt."

       contributors_fr_html: |-
         <strong>France</strong>: adatokat tartalmaz a következő forrásból:
            Direction Générale des Impôts.
       contributors_nl_html: |-
         <strong>Hollandia</strong>: adatokat tartalmaz innen: Automotive Navigation Data, 2007
       contributors_fr_html: |-
         <strong>France</strong>: adatokat tartalmaz a következő forrásból:
            Direction Générale des Impôts.
       contributors_nl_html: |-
         <strong>Hollandia</strong>: adatokat tartalmaz innen: Automotive Navigation Data, 2007

-        (<a href="http://www.and.com">www.and.com</a>)
+        (<a href="https://www.and.com">www.and.com</a>)

       contributors_nz_html: |-
         <strong>Új-Zéland</strong>: adatokat tartalmaz a következő forrásból:
            Land Information New Zealand. Szerzői jog fenntartva.
       contributors_nz_html: |-
         <strong>Új-Zéland</strong>: adatokat tartalmaz a következő forrásból:
            Land Information New Zealand. Szerzői jog fenntartva.


@@ -1083,7 +1084,7 @@ hu:
         adatokat &copy; Királyi szerzői és adatbázisjog \n2010 - 12."
       contributors_footer_1_html: |-
         További részletekért, és az OpenStreetMap javításához használt más forrásokról,
         adatokat &copy; Királyi szerzői és adatbázisjog \n2010 - 12."
       contributors_footer_1_html: |-
         További részletekért, és az OpenStreetMap javításához használt más forrásokról,

-        kérjük, olvassa el <a href="http://wiki.openstreetmap.org/wiki/contributors">a hozzájárulók oldalát
+        kérjük, olvassa el <a href="https://wiki.openstreetmap.org/wiki/contributors">a hozzájárulók oldalát

         az OpenStreetMap wikin.</a>
       contributors_footer_2_html: |2-
           Az adatok befoglalása az OpenStreetMapba nem jelenti azt, hogy az eredeti
         az OpenStreetMap wikin.</a>
       contributors_footer_2_html: |2-
           Az adatok befoglalása az OpenStreetMapba nem jelenti azt, hogy az eredeti


@@ -1095,13 +1096,13 @@ hu:
           szerzői jogvédett forrásból se (pl. Google Térkép vagy nyomtatott térképek) a
           szerzői jog tulajdonosának kifejezett engedélye nélkül.
       infringement_2_html: |-
           szerzői jogvédett forrásból se (pl. Google Térkép vagy nyomtatott térképek) a
           szerzői jog tulajdonosának kifejezett engedélye nélkül.
       infringement_2_html: |-

-        Ha úgy gondolod, hogy jogvédett anyag került jogszerűtlenül az OpenStreetMap adatbázisba vagy erre a weblapra, kérjük olvasd el az <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">eltávolítási
+        Ha úgy gondolod, hogy jogvédett anyag került jogszerűtlenül az OpenStreetMap adatbázisba vagy erre a weblapra, kérjük olvasd el az <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">eltávolítási

         folyamat leírását</a> vagy jelentsd be közvetlenül az
         <a href="http://dmca.openstreetmap.org/">online bejelentő oldalon</a>.
       trademarks_title_html: <span id="trademarks"></span>Védjegyek
       trademarks_1_html: OpenStreetMap, a nagyító ikon és a State of the Map az OpenStreetMap
         Foundation bejegyzett védjegyei. Ha kérdése van ezek felhasználásával kapcsolatban,
         folyamat leírását</a> vagy jelentsd be közvetlenül az
         <a href="http://dmca.openstreetmap.org/">online bejelentő oldalon</a>.
       trademarks_title_html: <span id="trademarks"></span>Védjegyek
       trademarks_1_html: OpenStreetMap, a nagyító ikon és a State of the Map az OpenStreetMap
         Foundation bejegyzett védjegyei. Ha kérdése van ezek felhasználásával kapcsolatban,

-        kérem küldje el a kérdéseit a <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence
+        kérem küldje el a kérdéseit a <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">Licence

         Working Group</a> részére.
   welcome_page:
     title: Üdvözlet!
         Working Group</a> részére.
   welcome_page:
     title: Üdvözlet!


@@ -1134,8 +1135,8 @@ hu:
       paragraph_1_html: "Az openStreetMap-nek van néhány formális szabálya is de alapvetően
         minden résztvevőtől azt várjuk el hogy együttműködjön és kommunikáljon a közösség
         többi tagjával. Ha bármilyen kézi szerkesztésen túlmutató tevékenységet tervezel
       paragraph_1_html: "Az openStreetMap-nek van néhány formális szabálya is de alapvetően
         minden résztvevőtől azt várjuk el hogy együttműködjön és kommunikáljon a közösség
         többi tagjával. Ha bármilyen kézi szerkesztésen túlmutató tevékenységet tervezel

-        akkor kérjük, hogy olvasd el az erről szóló útmutatókat az \n<a href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'>Importálásról</a>
-        és az \n<a href='http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>Automatikus
+        akkor kérjük, hogy olvasd el az erről szóló útmutatókat az \n<a href='https://wiki.openstreetmap.org/wiki/Import/Guidelines'>Importálásról</a>
+        és az \n<a href='https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>Automatikus

         szerkesztésekről</a> szóló lapokon."
     questions:
       title: Kérdésed van?
         szerkesztésekről</a> szóló lapokon."
     questions:
       title: Kérdésed van?


@@ -1168,7 +1169,7 @@ hu:
       title: Egyéb aggályok
       explanation_html: Ha kérdése merül fel az adataink felhasználásáról, vagy a
         tartalomról, akkor keresse fel a <a href='/copyright'>szerzői jogi oldalunkat</a>
       title: Egyéb aggályok
       explanation_html: Ha kérdése merül fel az adataink felhasználásáról, vagy a
         tartalomról, akkor keresse fel a <a href='/copyright'>szerzői jogi oldalunkat</a>

-        a további jogi információkért, vagy lépjen kapcsolatba a megfelelő <a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF
+        a további jogi információkért, vagy lépjen kapcsolatba a megfelelő <a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF

         munkacsoportot</a>.
   help_page:
     title: Segítségkérés
         munkacsoportot</a>.
   help_page:
     title: Segítségkérés


@@ -1180,7 +1181,7 @@ hu:
       title: Üdvözlünk az OSM-en
       description: Eza gyors útmutató megismertet az OpenStreetMap alapjaival.
     beginners_guide:
       title: Üdvözlünk az OSM-en
       description: Eza gyors útmutató megismertet az OpenStreetMap alapjaival.
     beginners_guide:

-      url: http://wiki.openstreetmap.org/wiki/Hu:Beginners%27_guide
+      url: https://wiki.openstreetmap.org/wiki/Hu:Beginners%27_guide

       title: Kezdők kézikönyve
       description: A közösség által karbantartott útmutató kezdőknek.
     help:
       title: Kezdők kézikönyve
       description: A közösség által karbantartott útmutató kezdőknek.
     help:


@@ -1224,8 +1225,8 @@ hu:
       technikusok, katasztrófa-sújtotta területeket térképező önkéntesek működnek
       közre a térkép szerkesztésében. Ha többet szeretnél megtudni a közösségről,
       lásd az <a href='https://blog.openstreetmap.org'>OpenStreetMap Blogot</a>, a
       technikusok, katasztrófa-sújtotta területeket térképező önkéntesek működnek
       közre a térkép szerkesztésében. Ha többet szeretnél megtudni a közösségről,
       lásd az <a href='https://blog.openstreetmap.org'>OpenStreetMap Blogot</a>, a

-      <a href='%{diary_path}'>felhasználói naplókat</a>, a <a href='http://blogs.openstreetmap.org/'>közösségi
-      blogokat</a>, és az <a href='http://www.osmfoundation.org/'>OSM Foundation</a>
+      <a href='%{diary_path}'>felhasználói naplókat</a>, a <a href='https://blogs.openstreetmap.org/'>közösségi
+      blogokat</a>, és az <a href='https://www.osmfoundation.org/'>OSM Foundation</a>

       weboldalát.
     open_data_title: Szabad adatok
     open_data_html: 'Az OpenStreetMap <i>szabad adatokból</i> áll: szabadon használhatod
       weboldalát.
     open_data_title: Szabad adatok
     open_data_html: 'Az OpenStreetMap <i>szabad adatokból</i> áll: szabadon használhatod


@@ -1235,9 +1236,9 @@ hu:
       a részletekért.'
     legal_title: Jogi segítség
     legal_html: |-
       a részletekért.'
     legal_title: Jogi segítség
     legal_html: |-

-      Az oldalt és sok kapcsolódó szolgáltatást formálisan az <a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF) üzemelteti, a közösség nevében. Az összes OSMF által üzemeltetett szolgáltatásra vonatkoznak az <a href="http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">Elfogadható felhasználási irányelvek</a>, és az <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy">Adatvédelmi nyilatkozat</a>.
+      Az oldalt és sok kapcsolódó szolgáltatást formálisan az <a href='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF) üzemelteti, a közösség nevében. Az összes OSMF által üzemeltetett szolgáltatásra vonatkoznak az <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">Elfogadható felhasználási irányelvek</a>, és az <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">Adatvédelmi nyilatkozat</a>.

       <br>
       <br>

-      <a href='http://osmfoundation.org/Contact'>Lépjen kapcsolatba az OSMF-fel</a>, ha licencelési, szerzői jogi vagy más jogi kérdése vagy problémája van.
+      <a href='https://osmfoundation.org/Contact'>Lépjen kapcsolatba az OSMF-fel</a>, ha licencelési, szerzői jogi vagy más jogi kérdése vagy problémája van.

     partners_title: Partnerek
   notifier:
     diary_comment_notification:
     partners_title: Partnerek
   notifier:
     diary_comment_notification:


@@ -1448,14 +1449,14 @@ hu:
       user_page_link: felhasználói oldal
       anon_edits_link_text: Nézz utána, miért van ez.
       flash_player_required: A Potlatch, az OpenStreetMap Flash szerkesztő használatához
       user_page_link: felhasználói oldal
       anon_edits_link_text: Nézz utána, miért van ez.
       flash_player_required: A Potlatch, az OpenStreetMap Flash szerkesztő használatához

-        Flash Player szükséges. <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">Letöltheted
-        a Flash Playert az Adobe.com-ról</a>. <a href="http://wiki.openstreetmap.org/wiki/Editing">Számos
+        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
         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: http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2'
+        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
       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


@@ -1547,7 +1548,7 @@ hu:
       edit: Szerkeszt
       preview: Előnézet
     markdown_help:
       edit: Szerkeszt
       preview: Előnézet
     markdown_help:

-      title_html: 'Megjelenítés: <a href="http://daringfireball.net/projects/markdown/">Markdown</a>'
+      title_html: 'Megjelenítés: <a href="https://daringfireball.net/projects/markdown/">Markdown</a>'

       headings: Címsorok
       heading: Címsor
       subheading: Alcím
       headings: Címsorok
       heading: Címsor
       subheading: Alcím


@@ -1654,7 +1655,7 @@ hu:
       description: Legfrissebb GPS nyomvonalak tallózása
       tagged_with: ' %{tags} címkével'
       empty_html: Még nincs mit megjeleníteni. <a href='%{upload_link}'>Tölts fel
       description: Legfrissebb GPS nyomvonalak tallózása
       tagged_with: ' %{tags} címkével'
       empty_html: Még nincs mit megjeleníteni. <a href='%{upload_link}'>Tölts fel

-        új nyomvonalat</a>, vagy olvass bővebben a GPS nyomvonalrögzítésről a <a href='http://wiki.openstreetmap.org/wiki/HU:Beginners_Guide_1.2'>wiki
+        új nyomvonalat</a>, vagy olvass bővebben a GPS nyomvonalrögzítésről a <a href='https://wiki.openstreetmap.org/wiki/HU:Beginners_Guide_1.2'>wiki

         lapon</a>.
     delete:
       scheduled_for_deletion: A nyomvonal törlésre kijelölve
         lapon</a>.
     delete:
       scheduled_for_deletion: A nyomvonal törlésre kijelölve


@@ -1865,11 +1866,11 @@ hu:
           <p>Ellentétben más térképekkel, az OpenStreetMapet teljes mértékben hozzád hasonló emberek készítik és bárki szabadon javíthatja, frissítheti, letöltheti vagy felhasználhatja.</p>
           <p>Regisztrálj és máris kezdheted a térképszerkesztést. Egy jóváhagyó e-mailt fogunk küldeni a címedre.</p>
       license_agreement: Amikor megerősíted a felhasználói fiókodat, el kell fogadnod
           <p>Ellentétben más térképekkel, az OpenStreetMapet teljes mértékben hozzád hasonló emberek készítik és bárki szabadon javíthatja, frissítheti, letöltheti vagy felhasználhatja.</p>
           <p>Regisztrálj és máris kezdheted a térképszerkesztést. Egy jóváhagyó e-mailt fogunk küldeni a címedre.</p>
       license_agreement: Amikor megerősíted a felhasználói fiókodat, el kell fogadnod

-        a <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">hozzájárulási
+        a <a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">hozzájárulási

         feltételeket</a>.
       email address: 'E-mail cím:'
       confirm email address: 'E-mail cím megerősítése:'
         feltételeket</a>.
       email address: 'E-mail cím:'
       confirm email address: 'E-mail cím megerősítése:'

-      not displayed publicly: Nem jelenik meg nyilvánosan (lásd <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy"
+      not displayed publicly: Nem jelenik meg nyilvánosan (lásd <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy"

         title="a wiki adatvédelmi irányelvei tartalmazzák az e-mail címekről szóló
         részt">adatvédelmi irányelvek</a>)
       display name: 'Megjelenítendő név:'
         title="a wiki adatvédelmi irányelvei tartalmazzák az e-mail címekről szóló
         részt">adatvédelmi irányelvek</a>)
       display name: 'Megjelenítendő név:'


@@ -1990,12 +1991,12 @@ hu:
       email never displayed publicly: (soha nem jelenik meg nyilvánosan)
       external auth: 'Külső Hitelesítés:'
       openid:
       email never displayed publicly: (soha nem jelenik meg nyilvánosan)
       external auth: 'Külső Hitelesítés:'
       openid:

-        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link: https://wiki.openstreetmap.org/wiki/OpenID

         link text: mi ez?
       public editing:
         heading: 'Nyilvános szerkesztés:'
         enabled: Engedélyezve. Nem vagy névtelen, így szerkesztheted az adatokat.
         link text: mi ez?
       public editing:
         heading: 'Nyilvános szerkesztés:'
         enabled: Engedélyezve. Nem vagy névtelen, így szerkesztheted az adatokat.

-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        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.
         enabled link text: mi ez?
         disabled: Tiltva, így nem szerkesztheted az adatokat, az összes eddigi szerkesztés
           névtelen.


@@ -2007,7 +2008,7 @@ hu:
           szerkesztettél, és megengedd az embereknek, hogy a webhelyen keresztül kapcsolatba
           lépjenek veled, kattints az alábbi gombra. <b>A 0.6 API-ra történt átállás
           óta csak nyilvános felhasználók szerkeszthetik a térképadatokat</b>. (<a
           szerkesztettél, és megengedd az embereknek, hogy a webhelyen keresztül kapcsolatba
           lépjenek veled, kattints az alábbi gombra. <b>A 0.6 API-ra történt átállás
           óta csak nyilvános felhasználók szerkeszthetik a térképadatokat</b>. (<a

-          href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">nézz utána, miért</a>).<ul><li>Az
+          href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">nézz utána, miért</a>).<ul><li>Az

           e-mail címed nem kerül felfedésre azzal, hogy nyilvános leszel.</li><li>Ez
           a művelet nem vonható vissza, és alapértelmezésben az összes új felhasználó
           már nyilvános.</li></ul>
           e-mail címed nem kerül felfedésre azzal, hogy nyilvános leszel.</li><li>Ez
           a művelet nem vonható vissza, és alapértelmezésben az összes új felhasználó
           már nyilvános.</li></ul>

diff --git a/config/locales/is.yml b/config/locales/is.yml
index 1b2c62cc01b8708ef67e843aa8fffc0e9f764d29..4fbcde5021b1f5a3682cd5aa31aa0c0a1283cde7 100644 (file)
--- a/config/locales/is.yml
+++ b/config/locales/is.yml
@@ -99,8 +99,8 @@ is:
       name: Potlatch 2
       description: Potlatch 2 (ritill í vafra)
     remote:
       name: Potlatch 2
       description: Potlatch 2 (ritill í vafra)
     remote:

-      name: Fjarstýring
-      description: Fjarstýring (JOSM eða Merkaartor)
+      name: RC-fjarstýring
+      description: RC-fjarstýring (JOSM eða Merkaartor)

   browse:
     created: Búið til
     closed: Lokað
   browse:
     created: Búið til
     closed: Lokað


@@ -140,6 +140,8 @@ is:
         title_comment: Breytingasett %{id} - %{comment}
       join_discussion: Skráðu þig inn til að taka þátt í umræðunni
       discussion: Umræða
         title_comment: Breytingasett %{id} - %{comment}
       join_discussion: Skráðu þig inn til að taka þátt í umræðunni
       discussion: Umræða

+      still_open: Breytingasett er enn opið - Umræða mun opnast þegar breytingasettinu
+        hefur verið lokað.

     node:
       title: 'Hnútur: %{name}'
       history_title: 'Saga hnúts: %{name}'
     node:
       title: 'Hnútur: %{name}'
       history_title: 'Saga hnúts: %{name}'


@@ -147,6 +149,9 @@ is:
       title: 'Leið: %{name}'
       history_title: 'Saga leiðar: %{name}'
       nodes: Hnútar
       title: 'Leið: %{name}'
       history_title: 'Saga leiðar: %{name}'
       nodes: Hnútar

+      also_part_of:
+        one: hluti leiðar %{related_ways}
+        other: hlutar leiða %{related_ways}

     relation:
       title: 'Vensl: %{name}'
       history_title: 'Ferill vensla: %{name}'
     relation:
       title: 'Vensl: %{name}'
       history_title: 'Ferill vensla: %{name}'


@@ -171,7 +176,7 @@ is:
         note: minnispunktur
     timeout:
       sorry: Ekki var hægt að ná í gögn fyrir %{type} með kennitöluna %{id}, það tók
         note: minnispunktur
     timeout:
       sorry: Ekki var hægt að ná í gögn fyrir %{type} með kennitöluna %{id}, það tók

-        of langann tíma að ná í gögnin.
+        of langan tíma að ná í gögnin.

       type:
         node: hnútinn
         way: leiðina
       type:
         node: hnútinn
         way: leiðina


@@ -180,6 +185,9 @@ is:
         note: minnispunktur
     redacted:
       redaction: Endurskoðun %{id}
         note: minnispunktur
     redacted:
       redaction: Endurskoðun %{id}

+      message_html: Ekki er hægt að birta útgáfu %{version} af þessu %{type} því hún
+        hefur verið endurskoðuð. Endilega skoðaðu %{redaction_link} til að sjá nánari
+        upplýsingar.

       type:
         node: hnút
         way: leið
       type:
         node: hnút
         way: leið


@@ -245,8 +253,19 @@ is:
       title_friend: Breytingar eftir vini þína
       title_nearby: Breytingar eftir nálæga notendur
       empty: Engin breytingasett fundust.
       title_friend: Breytingar eftir vini þína
       title_nearby: Breytingar eftir nálæga notendur
       empty: Engin breytingasett fundust.

+      empty_area: Engin breytingasett á þessu svæði.
+      empty_user: Engin breytingasett eftir þennan notanda.
+      no_more: Engin fleiri breytingasett fundust.
+      no_more_area: Engin fleiri breytingasett á þessu svæði.
+      no_more_user: Engin fleiri breytingasett eftir þennan notanda.

       load_more: Hlaða inn fleiri
       load_more: Hlaða inn fleiri

+    timeout:
+      sorry: Því miður, það tók of langan tíma að ná í listann yfir breytingasett
+        sem þú baðst um.

     rss:
     rss:

+      title_all: Umræða um OpenStreetMap breytingasett
+      title_particular: 'Umræða um OpenStreetMap breytingasettið #%{changeset_id}'
+      comment: 'Ný athugasemd við breytingasettið #%{changeset_id} eftir %{author}'

       commented_at_html: Uppfært fyrir %{when}
       commented_at_by_html: Uppfært fyrir %{when} af %{user}
       full: Öll umræðan
       commented_at_html: Uppfært fyrir %{when}
       commented_at_by_html: Uppfært fyrir %{when} af %{user}
       full: Öll umræðan


@@ -336,18 +355,29 @@ is:
       map_image: Kortamynd (sýnir staðallagið)
       embeddable_html: HTML til að bæta á vefsíðu
       licence: Leyfi
       map_image: Kortamynd (sýnir staðallagið)
       embeddable_html: HTML til að bæta á vefsíðu
       licence: Leyfi

-      export_details: OpenStreetMap gögnin eru með <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open
+      export_details: OpenStreetMap gögnin eru með <a href="https://opendatacommons.org/licenses/odbl/1.0/">Open

         Data Commons Open Database License</a> (ODbL) notkunarleyfi.
       too_large:
         Data Commons Open Database License</a> (ODbL) notkunarleyfi.
       too_large:

+        advice: 'Ef útflutningurinn hér að ofan mistekst, íhugaðu að nota einn af
+          gagnagjöfunum sem taldir eru upp hér að neðan:'

         body: Svæðið sem þú ert að reyna að flytja út á OpenStreetMap á XML-sniði
           er of stórt. Auktu aðdráttinn eða veldu smærra svæði, nú eða notaðu eina
           af eftirfarandi leiðum til að flytja inn mikið magn gagna.
         planet:
           title: OSM-plánetan
         body: Svæðið sem þú ert að reyna að flytja út á OpenStreetMap á XML-sniði
           er of stórt. Auktu aðdráttinn eða veldu smærra svæði, nú eða notaðu eina
           af eftirfarandi leiðum til að flytja inn mikið magn gagna.
         planet:
           title: OSM-plánetan

+          description: Reglulega uppfærð afrit af öllum OpenStreetMap gagnagrunninum
+        overpass:
+          title: Overpass API-forritsviðmót
+          description: Sæktu þennan gagnaramma frá spegli af OpenStreetMap gagnagrunninum

         geofabrik:
           title: Niðurhöl frá Geofabrik
         geofabrik:
           title: Niðurhöl frá Geofabrik

+          description: Reglulega uppfært yfirlit heimsálfa, landa og valinna borga
+        metro:
+          title: Yfirlit veðurspár
+          description: Yfirlit veðurspár fyrir helstu heimsborgir og nágrenni þeirra

         other:
           title: Aðrar heimildir
         other:
           title: Aðrar heimildir

+          description: Aðrir gagnagjafar sem taldir eru upp á kviku/wiki OpenStreetMap

       options: Valmöguleikar
       format: Snið
       scale: Kvarði
       options: Valmöguleikar
       format: Snið
       scale: Kvarði


@@ -363,14 +393,14 @@ is:
   geocoder:
     search:
       title:
   geocoder:
     search:
       title:

-        latlon: Niðurstöður frá <a href="http://openstreetmap.org/">Internal</a>
+        latlon: Niðurstöður frá <a href="https://openstreetmap.org/">Internal</a>

         uk_postcode: Niðurstöður frá <a href="http://www.npemap.org.uk/">NPEMap /
           FreeThe Postcode</a>
         uk_postcode: Niðurstöður frá <a href="http://www.npemap.org.uk/">NPEMap /
           FreeThe Postcode</a>

-        ca_postcode: Niðurstöður frá <a href="http://geocoder.ca/">Geocoder.CA</a>
-        osm_nominatim: Niðurstöður frá <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        ca_postcode: Niðurstöður frá <a href="https://geocoder.ca/">Geocoder.CA</a>
+        osm_nominatim: Niðurstöður frá <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a>
         geonames: Niðurstöður frá <a href="http://www.geonames.org/">GeoNames</a>
           Nominatim</a>
         geonames: Niðurstöður frá <a href="http://www.geonames.org/">GeoNames</a>

-        osm_nominatim_reverse: Niðurstöður frá <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim_reverse: Niðurstöður frá <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a>
         geonames_reverse: Niðurstöður frá <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
           Nominatim</a>
         geonames_reverse: Niðurstöður frá <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:


@@ -381,6 +411,7 @@ is:
           chair_lift: Stólalyfta
           drag_lift: Toglyfta
           gondola: Eggjalyfta
           chair_lift: Stólalyfta
           drag_lift: Toglyfta
           gondola: Eggjalyfta

+          station: Lyftustöð

         aeroway:
           aerodrome: Flugsvæði
           apron: Flughlað
         aeroway:
           aerodrome: Flugsvæði
           apron: Flughlað


@@ -428,6 +459,7 @@ is:
           ferry_terminal: Ferjustöð
           fire_hydrant: Brunahani
           fire_station: Slökkvistöð
           ferry_terminal: Ferjustöð
           fire_hydrant: Brunahani
           fire_station: Slökkvistöð

+          food_court: Veitingasvæði

           fountain: Gosbrunnur
           fuel: Eldsneyti
           gambling: Fjárhættuspil
           fountain: Gosbrunnur
           fuel: Eldsneyti
           gambling: Fjárhættuspil


@@ -468,6 +500,7 @@ is:
           shop: Verslun
           shower: Steypibað
           social_centre: Félagsmiðstöð
           shop: Verslun
           shower: Steypibað
           social_centre: Félagsmiðstöð

+          social_facility: Félagsþjónusta

           studio: Stúdíó
           swimming_pool: Sundlaug
           taxi: Leigubílastöð
           studio: Stúdíó
           swimming_pool: Sundlaug
           taxi: Leigubílastöð


@@ -518,13 +551,17 @@ is:
           construction: Hraðbraut í byggingu
           cycleway: Hjólastígur
           elevator: Lyfta
           construction: Hraðbraut í byggingu
           cycleway: Hjólastígur
           elevator: Lyfta

+          emergency_access_point: Neyðaraðgangur

           footway: Göngustígur
           ford: Vað
           living_street: Vistgata
           footway: Göngustígur
           ford: Vað
           living_street: Vistgata

+          milestone: Vegalengdarsteinn

           motorway: Hraðbraut
           motorway: Hraðbraut

+          motorway_junction: Þjóðvegatenging
+          motorway_link: Hraðbraut

           path: Slóð
           pedestrian: Gönguleið
           path: Slóð
           pedestrian: Gönguleið

-          platform: Kerfishögun
+          platform: Pallur

           primary: Stofnvegur
           primary_link: Stofnvegur
           proposed: Tillaga um veglagningu
           primary: Stofnvegur
           primary_link: Stofnvegur
           proposed: Tillaga um veglagningu


@@ -535,20 +572,24 @@ is:
           secondary: Tengivegur
           secondary_link: Tengivegur
           service: Þjónustuvegur
           secondary: Tengivegur
           secondary_link: Tengivegur
           service: Þjónustuvegur

+          services: Hraðbrautaþjónusta

           speed_camera: Hraðamyndavél
           steps: Tröppur
           street_lamp: Ljósastaur
           speed_camera: Hraðamyndavél
           steps: Tröppur
           street_lamp: Ljósastaur

-          track: Spor
+          tertiary: Annar vegur
+          tertiary_link: Annar vegur
+          track: Slóði

           traffic_signals: Umferðarljós
           traffic_signals: Umferðarljós

-          trail: Slóði
-          trunk: Stofnbraut
-          trunk_link: Stofnbraut
+          trail: Stígur
+          trunk: Stofnbraut (Hringvegurinn)
+          trunk_link: Stofnbraut (Hringvegurinn)

           unclassified: Óflokkaður vegur
           unsurfaced: Vegur án slitlags
           "yes": Vegur
         historic:
           archaeological_site: Fornminjar
           battlefield: Orustuvöllur
           unclassified: Óflokkaður vegur
           unsurfaced: Vegur án slitlags
           "yes": Vegur
         historic:
           archaeological_site: Fornminjar
           battlefield: Orustuvöllur

+          boundary_stone: Landamerkjasteinn

           building: Söguleg bygging
           bunker: Sprengjubyrgi
           castle: Kastali
           building: Söguleg bygging
           bunker: Sprengjubyrgi
           castle: Kastali


@@ -568,6 +609,8 @@ is:
           stone: Steinn
           tomb: Gröf
           tower: Turn
           stone: Steinn
           tomb: Gröf
           tower: Turn

+          wayside_cross: Vegakross
+          wayside_shrine: Vegaskrín

           wreck: Flak
         junction:
           "yes": Tenging
           wreck: Flak
         junction:
           "yes": Tenging


@@ -581,6 +624,7 @@ is:
           construction: Bygging
           farm: Býli
           farmland: Ræktarland
           construction: Bygging
           farm: Býli
           farmland: Ræktarland

+          farmyard: Hlað

           forest: Skógur
           garages: Verkstæði
           grass: Gras
           forest: Skógur
           garages: Verkstæði
           grass: Gras


@@ -593,9 +637,13 @@ is:
           orchard: Trjágarður
           quarry: Grjótnáma
           railway: Lestarteinar
           orchard: Trjágarður
           quarry: Grjótnáma
           railway: Lestarteinar

+          recreation_ground: Leikvöllur

           reservoir: Uppistöðulón
           reservoir: Uppistöðulón

+          reservoir_watershed: Vatnasvið uppistöðulóns

           residential: Íbúðasvæði
           retail: Smásala
           residential: Íbúðasvæði
           retail: Smásala

+          road: Vegsvæði
+          village_green: Grænt svæði

           vineyard: Vínekra
           "yes": Landnotkun
         leisure:
           vineyard: Vínekra
           "yes": Landnotkun
         leisure:


@@ -618,6 +666,7 @@ is:
           pitch: Íþróttavöllur
           playground: Leikvöllur
           recreation_ground: Leikvöllur
           pitch: Íþróttavöllur
           playground: Leikvöllur
           recreation_ground: Leikvöllur

+          resort: Ferðamannastaður

           sauna: Gufubað
           slipway: Slippur
           sports_centre: Íþróttamiðstöð
           sauna: Gufubað
           slipway: Slippur
           sports_centre: Íþróttamiðstöð


@@ -685,7 +734,10 @@ is:
           employment_agency: Vinnumiðlun
           estate_agent: Fasteignasali
           government: Stjórnarskrifstofa
           employment_agency: Vinnumiðlun
           estate_agent: Fasteignasali
           government: Stjórnarskrifstofa

+          insurance: Tryggingaskrifstofa

           lawyer: Lögmaður
           lawyer: Lögmaður

+          ngo: Skrifstofa frjálsra félagasamtaka
+          telecommunication: Fjarskiptaskrifstofa

           travel_agent: Ferðaskrifstofa
           "yes": Skrifstofa
         place:
           travel_agent: Ferðaskrifstofa
           "yes": Skrifstofa
         place:


@@ -713,6 +765,7 @@ is:
           subdivision: Undirskipting
           suburb: Úthverfi
           town: Bær
           subdivision: Undirskipting
           suburb: Úthverfi
           town: Bær

+          unincorporated_area: Landsvæði utan sveitarfélaga

           village: Þorp
           "yes": Staður
         railway:
           village: Þorp
           "yes": Staður
         railway:


@@ -723,15 +776,25 @@ is:
           funicular: Kláfbraut
           halt: Lestarstopp
           historic_station: Söguleg lestarstöð
           funicular: Kláfbraut
           halt: Lestarstopp
           historic_station: Söguleg lestarstöð

+          junction: Járnbrautatenging

           level_crossing: Þverun brautarteina
           level_crossing: Þverun brautarteina

-          light_rail: Smálest
+          light_rail: Léttlest
+          miniature: Smálest

           monorail: Einteinungur
           monorail: Einteinungur

+          narrow_gauge: Lestarteinar með minna bili
+          platform: Brautarpallur
+          preserved: Varðveitt lestarspor
+          proposed: Tillaga um lestarteinalagningu
+          spur: Lestarteinastubbur

           station: Lestarstöð
           station: Lestarstöð

+          stop: Stöðvunarsvæði lestar

           subway: Neðanjarðarlest
           subway_entrance: Inngangur í neðanjarðarlest
           subway: Neðanjarðarlest
           subway_entrance: Inngangur í neðanjarðarlest

+          switch: Lestarteinaskipting

           tram: Sporvagn
           tram_stop: Sporvagnastöð
         shop:
           tram: Sporvagn
           tram_stop: Sporvagnastöð
         shop:

+          alcohol: Án vínveitingaleyfis

           antiques: Antíkverslun
           art: Listmunaverslun
           bakery: Bakarí
           antiques: Antíkverslun
           art: Listmunaverslun
           bakery: Bakarí


@@ -739,19 +802,28 @@ is:
           beverages: Drykkjarfangaverslun
           bicycle: Hjólaverslun
           books: Bókabúð
           beverages: Drykkjarfangaverslun
           bicycle: Hjólaverslun
           books: Bókabúð

+          boutique: Sérverslun

           butcher: Slátrari
           car: Bílavöruverslun
           car_parts: Bílapartar
           car_repair: Bílaviðgerðir
           carpet: Teppabúð
           butcher: Slátrari
           car: Bílavöruverslun
           car_parts: Bílapartar
           car_repair: Bílaviðgerðir
           carpet: Teppabúð

+          charity: Góðgerðaverslun
+          chemist: Lyfsali

           clothes: Fataverslun
           computer: Tölvuverslun
           clothes: Fataverslun
           computer: Tölvuverslun

+          confectionery: Sælgætisverslun
+          convenience: Kjörbúð

           copyshop: Ljósritunarverslun
           cosmetics: Snyrtivöruverslun
           copyshop: Ljósritunarverslun
           cosmetics: Snyrtivöruverslun

+          deli: Sælkeraverslun

           department_store: Kjörbúð
           department_store: Kjörbúð

+          discount: Afsláttarvöruverslun
+          doityourself: Föndurvörur

           dry_cleaning: Þurrhreinsun
           electronics: Raftækjaverslun
           estate_agent: Fasteignasali
           dry_cleaning: Þurrhreinsun
           electronics: Raftækjaverslun
           estate_agent: Fasteignasali

+          farm: Beint frá býli

           fashion: Tískuverslun
           fish: Fiskbúð
           florist: Blómabúð
           fashion: Tískuverslun
           fish: Fiskbúð
           florist: Blómabúð


@@ -763,6 +835,7 @@ is:
           general: Almenn verslun
           gift: Gjafabúð
           greengrocer: Grænmetissali
           general: Almenn verslun
           gift: Gjafabúð
           greengrocer: Grænmetissali

+          grocery: Matvöruverslun

           hairdresser: Hársnyrting
           hardware: Verkfærabúð
           hifi: Hljómtækjaverslun
           hairdresser: Hársnyrting
           hardware: Verkfærabúð
           hifi: Hljómtækjaverslun


@@ -793,6 +866,7 @@ is:
           toys: Leikfangaverslun
           travel_agency: Ferðaskrifstofa
           video: Videoleiga
           toys: Leikfangaverslun
           travel_agency: Ferðaskrifstofa
           video: Videoleiga

+          wine: Án vínveitingaleyfis

           "yes": Verslun
         tourism:
           alpine_hut: Fjallaskáli
           "yes": Verslun
         tourism:
           alpine_hut: Fjallaskáli


@@ -816,11 +890,14 @@ is:
           viewpoint: Útsýnisstaður
           zoo: Dýragarður
         tunnel:
           viewpoint: Útsýnisstaður
           zoo: Dýragarður
         tunnel:

+          culvert: Ræsi

           "yes": Göng
         waterway:
           "yes": Göng
         waterway:

+          artificial: Manngerð vatnaleið

           boatyard: Bátalægi
           canal: Skipaskurður
           dam: Vatnsaflsvirkjunin
           boatyard: Bátalægi
           canal: Skipaskurður
           dam: Vatnsaflsvirkjunin

+          derelict_canal: Aflagður skipaskurður

           ditch: Skurður
           dock: Hafnarbakki
           drain: Dren
           ditch: Skurður
           dock: Hafnarbakki
           drain: Dren


@@ -830,7 +907,9 @@ is:
           rapids: Flúðir
           river: Á
           stream: Lækur
           rapids: Flúðir
           river: Á
           stream: Lækur

+          wadi: Wadi

           waterfall: Foss
           waterfall: Foss

+          weir: Stíflugarður

           "yes": Siglingaleið
       admin_levels:
         level2: Landamæri
           "yes": Siglingaleið
       admin_levels:
         level2: Landamæri


@@ -842,7 +921,7 @@ is:
         level10: Úthverfamörk
     description:
       title:
         level10: Úthverfamörk
     description:
       title:

-        osm_nominatim: Staðsetning frá <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim: Staðsetning frá <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a>
         geonames: Staðsetning frá <a href="http://www.geonames.org/">GeoNames</a>
       types:
           Nominatim</a>
         geonames: Staðsetning frá <a href="http://www.geonames.org/">GeoNames</a>
       types:


@@ -880,6 +959,7 @@ is:
     intro_text: OpenStreetMap er heimskort búið til af fólki eins og þér. Það er gefið
       út með opnu hugbúnaðarleyfi og það kostar ekkert að nota það.
     intro_2_create_account: Búa til notandaaðgang
     intro_text: OpenStreetMap er heimskort búið til af fólki eins og þér. Það er gefið
       út með opnu hugbúnaðarleyfi og það kostar ekkert að nota það.
     intro_2_create_account: Búa til notandaaðgang

+    partners_html: Vefhýsing er studd af %{ucl}, %{bytemark}, %{ic}, og öðrum %{partners}.

     partners_ucl: UCL
     partners_ic: Imperial College London
     partners_bytemark: Bytemark Hosting
     partners_ucl: UCL
     partners_ic: Imperial College London
     partners_bytemark: Bytemark Hosting


@@ -890,7 +970,7 @@ is:
     donate: Hjálpaðu OpenStreetMap verkefninu með %{link} í vélbúnaðarsjóðinn.
     help: Hjálp
     about: Um hugbúnaðinn
     donate: Hjálpaðu OpenStreetMap verkefninu með %{link} í vélbúnaðarsjóðinn.
     help: Hjálp
     about: Um hugbúnaðinn

-    copyright: Höfundaréttur
+    copyright: Höfundarréttur

     community: Samfélag
     community_blogs: Blogg félaga
     community_blogs_title: Blogg frá meðlimum OpenStreetMap samfélagsins
     community: Samfélag
     community_blogs: Blogg félaga
     community_blogs_title: Blogg frá meðlimum OpenStreetMap samfélagsins


@@ -916,37 +996,167 @@ is:
       native_link: íslensku útgáfuna
       mapping_link: farið að kortleggja
     legal_babble:
       native_link: íslensku útgáfuna
       mapping_link: farið að kortleggja
     legal_babble:

-      title_html: Höfundaréttur og leyfi
+      title_html: Höfundarréttur og notkunarleyfi

       intro_1_html: |-
         OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> er <i>opinn og frjáls kortagrunnur</i>, gefinn út með <a
       intro_1_html: |-
         OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> er <i>opinn og frjáls kortagrunnur</i>, gefinn út með <a

-        href="http://opendatacommons.org/licenses/odbl/">Open Data
+        href="https://opendatacommons.org/licenses/odbl/">Open Data

         Commons Open Database License</a> (ODbL) notkunarleyfi frá  <a
         Commons Open Database License</a> (ODbL) notkunarleyfi frá  <a

-        href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF) sjálfseignarstofnuninni.
+        href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF) sjálfseignarstofnuninni.

       intro_2_html: |-
       intro_2_html: |-

-        Þér er frjálst að afrita, dreifa, senda og aðlaga kortagrunninnn
+        Þér er frjálst að afrita, dreifa, senda og aðlaga kortagrunninn

          og gögn hans, gegn því að þú vísar í og viðurkennir rétt OpenStreetMap
         og sjálfboðaliða þess. Ef þú breytir eða byggir á kortagrunninum
         eða gögnum hans, þá verður þú að gefa niðurstöðuna út með
         sama leyfi.
          og gögn hans, gegn því að þú vísar í og viðurkennir rétt OpenStreetMap
         og sjálfboðaliða þess. Ef þú breytir eða byggir á kortagrunninum
         eða gögnum hans, þá verður þú að gefa niðurstöðuna út með
         sama leyfi.

-        <a href="http://opendatacommons.org/licenses/odbl/1.0/">Leyfistextinn</a>
+        <a href="https://opendatacommons.org/licenses/odbl/1.0/">Leyfistextinn</a>

         útskýrir réttindi þín og skyldur.
         útskýrir réttindi þín og skyldur.

+      intro_3_html: |-
+        Landupplýsingarnar í kortaflísunum okkar, og í hjálparskjölunum, eru
+        gefnar út með <a href="https://creativecommons.org/licenses/by-sa/2.0/">Creative
+        Commons Attribution-ShareAlike 2.0</a> notkunarleyfi (CC BY-SA).
+      credit_title_html: Hvernig á að vísa til OpenStreetMap
+      credit_1_html: |-
+        Við gerum kröfu um að þú notir tilvísunina &ldquo;&copy; Þátttakendur í
+        OpenStreetMap verkefninu&rdquo;.
+      credit_2_html: "Þú þarft líka að taka skýrt fram að gögnin séu tiltæk með Open\nDatabase
+        notkunarleyfi, og ef verið sé að nota kortaflísar frá okkur, að kortagögnin
+        \nséu með CC BY-SA notkunarleyfi. Þú getur gert það með því að tengja\ná<a
+        href=\"https://www.openstreetmap.org/copyright\">þessa höfundarréttarsíðu</a>.\nAnnars,
+        og þess er krafist ef þú ert að dreifa OSM á einhverju\ngagnaformi, geturðu
+        talið upp og tengt beint á leyfishafana. Í miðlum\nþar sem tenglar eru varla
+        mögulegir (t.d. prentuðum verkum), stingum við upp á að\nþú beinir lesendum
+        á openstreetmap.org (mögulega að tengja\n'OpenStreetMap' við fullt vistfang
+        þessarar síðu), á opendatacommons.org, og\nef slíkt á við, á creativecommons.org."
+      credit_3_html: |-
+        Á flettanlegum rafrænum landakortum ætti tilvísunin að birtast í horni kortsins.
+        Til dæmis:
+      attribution_example:
+        alt: Dæmi um hvernig eigi að vísa til OpenStreetMap á vefsíðu
+        title: Dæmi um tilvísun

       more_title_html: Finna út meira
       more_title_html: Finna út meira

+      more_1_html: |-
+        Lestu meira um notkun á gögnunum okkar og hvernig eigi að vísa til okkar á síðunni<a
+        href="https://osmfoundation.org/Licence">OSMF notkunarleyfi</a>.
+      more_2_html: |-
+        Þó OpenStreetMap snúist um opin gögn, getum við ekki
+        séð utanaðkomandi aðilum fyrir ókeypis API-kortaþjónustu.
+        Skoðaðu síðurnar um <a href="https://operations.osmfoundation.org/policies/api/">notkun á API-forritsviðmóti</a>,
+        <a href="https://operations.osmfoundation.org/policies/tiles/">notkun á kortaflísum</a>
+        and <a href="https://operations.osmfoundation.org/policies/nominatim/">notkun á OSM-Nominatim</a>.

       contributors_title_html: Þeir sem hafa komið með framlög
       contributors_title_html: Þeir sem hafa komið með framlög

+      contributors_intro_html: |-
+        Framlög hafa komið frá mörgum þúsundum einstaklinga. Við erum líka
+        með gögn með opnum notkunarleyfum frá þjóðlegum landupplýsingastofnunum
+        auk annarra opinberra aðila, meðal annars:
+      contributors_at_html: |-
+        <strong>Austurríki</strong>: Inniheldur gögn frá
+        <a href="https://data.wien.gv.at/">Stadt Wien</a> (með
+        <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
+        <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> og
+        Land Tirol (under <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC BY AT með viðaukum</a>).
+      contributors_ca_html: |-
+        <strong>Kanada</strong>: Inniheldur gögn frá
+        GeoBase&reg;, GeoGratis (&copy; Department of Natural
+        Resources Canada), CanVec (&copy; Department of Natural
+        Resources Canada), og StatCan (Geography Division,
+        Statistics Canada).
+      contributors_fi_html: |-
+        <strong>Finnland</strong>: Inniheldur gögn frá
+        landupplýsingagagnagrunni Landmælinga Finnlands
+        auk annarra gagnasafna, með
+        <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">NLSFI notkunarleyfi</a>.
+      contributors_fr_html: |-
+        <strong>Frakkland</strong>: Inniheldur afleidd gögn frá
+        Direction Générale des Impôts (Skattstjóraembættið).
+      contributors_nl_html: |-
+        <strong>Holland</strong>: Inniheldur AND-gögn &copy;, 2007
+        (<a href="https://www.and.com">www.and.com</a>)
+      contributors_nz_html: |-
+        <strong>Nýja-Sjáland</strong>: Inniheldur gögn með uppruna frá
+        Land Information New Zealand. Með Crown Copyright höfundarrétti.
+      contributors_si_html: |-
+        <strong>Slóvenía</strong>: Inniheldur gögn frá
+        <a href="http://www.gu.gov.si/en/">landmælinga og kortagerðaryfirvöldum</a> og
+        <a href="http://www.mkgp.gov.si/en/">ráðuneyti landbúnaðar, skógnýtingar og matvæla</a>
+        (opinberar upplýsingar í Slóveníu).
+      contributors_za_html: |-
+        <strong>Suður-Afríka</strong>: Inniheldur gögn frá
+        <a href="http://www.ngi.gov.za/">Chief Directorate:
+        National Geo-Spatial Information</a>, höfundarréttur suðurafríska ríkisins (state copyright) áskilinn.
+      contributors_gb_html: |-
+        <strong>Bretland</strong>: Inniheldur landmælinga-
+        og kortagerðargögn með &copy; Crown Copyright höfundarrétti auk réttinda varðandi gagnasafn
+        2010-12.
+      contributors_footer_1_html: |-
+        Til að skoða nánari upplýsingar um þetta, auk annarra gagna sem notuð hafa verið
+        til að bæta OpenStreetMap, skoðaðu þá síðuna <a
+        href="https://wiki.openstreetmap.org/wiki/Contributors">Þátttakendur</a> á wiki/kvikusvæði OpenStreetMap.
+      contributors_footer_2_html: |-
+        Samþætting gagna inn í OpenStreetMap hefur ekki sjálfkrafa í för með sér að
+        upprunaleg gagnaþjónusta taki þátt í OpenStreetMap, taki neina ábyrgð á gögnum, eða
+        samþykki skaðabótaskyldu vegna þeirra.

       infringement_title_html: Brot á höfundarrétti
       infringement_title_html: Brot á höfundarrétti

+      infringement_1_html: |-
+        Þátttakendur í OSM eru minntir á að þeir megi aldrei bæta inn gögnum frá neinum
+        höfundarréttarvörðum upptökum (t.d. Google Maps eða prentuðum kortum) án
+        sérstakrar heimildar frá handhöfum höfundarréttarins.
+      infringement_2_html: |-
+        Ef þú heldur að höfundarréttarvarið efni hafi ranglega verið bætt í
+        OpenStreetMap gagnagrunninn eða á þetta vefsvæði, skaltu skoða
+        <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">fjarlægingarferlið</a> okkar eða skrá fyrirspurn beint á
+         veflægu<a href="http://dmca.openstreetmap.org/">kröfugerðarsíðuna</a> okkar.

       trademarks_title_html: <span id="trademarks"></span>Vörumerki
       trademarks_title_html: <span id="trademarks"></span>Vörumerki

+      trademarks_1_html: OpenStreetMap, merkið með stækkunarglerinu staða kortsins
+        eru skrásett vörumerki OpenStreetMap Foundation sjálfseignarstofnuninnar.
+        Ef þú ert með spurningar varðandi notkun þína á þessum vörumerkjum, sendu
+        þá fyrirspurnir á <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">vinnuhóp
+        notkunarleyfa</a>.

   welcome_page:
     title: Velkomin!
   welcome_page:
     title: Velkomin!

+    introduction_html: |-
+      Velkomin í OpenStreetMap, frjálsa heimskortinu sem þú getur breytt og lagað. Núna þegar þú ert
+      búin(n) að skrá þig, geturðu farið að setja atriði inn á kortið. Hér er fljótlegur leiðarvísir
+      með því helsta sem þú þarft að vita.

     whats_on_the_map:
       title: Hvað er á kortinu
     whats_on_the_map:
       title: Hvað er á kortinu

+      on_html: |-
+        OpenStreetMap er staður til að gera kort með <em>varanlegum eða tímabundnum</em> fyrirbærum -
+        nú þegar eru þarna milljónir bygginga, vega og annarra smáatriða sem lýsa stöðum. Þú getur kortlagt
+        hvaðeina sem þér finnst áhugavert og sem tilheyrir raunheimum.
+      off_html: |-
+        Það sem OSM inniheldur <em>ekki</em> eru gögn sem byggjast á skoðunum eintaklinga, sagnfræðilegar tilgátur eða
+        möguleikar, að ógleymdum gögnum frá höfundarréttarvörðum upptökum. Ef þú ert ekki með sérstakt leyfi til slíks,
+        ekki afrita eftir landakortum á pappír eða á netinu.

     basic_terms:
     basic_terms:

+      title: Grunnhugtök við kortagerð
+      paragraph_1_html: OpenStreetMap inniheldur svolítið af eigin slangurorðum. Hér
+        eru nokkur algeng orð sem gott er að hafa á bak við eyrað.
+      editor_html: <strong>Ritill</strong> er forrit eða vefsvæði sem hægt er að nota
+        við breytingar á landakortinu.
+      node_html: <strong>Hnútur</strong> er punktur á kortinu, eins og til dæmis veitingastaður
+        eða tré.
+      way_html: <strong>Leið</strong> er lína eða svæði, eins og til dæmis vegur,
+        vatnsfall, tjörn eða bygging.

       tag_html: |-
         <strong>Merki</strong> er dálítill gagnabútur varðandi leið eða annað atriði, til dæmis
         nafn á veitingastað eða hraðatakmörk á vegi.
     rules:
       title: Reglur!
       tag_html: |-
         <strong>Merki</strong> er dálítill gagnabútur varðandi leið eða annað atriði, til dæmis
         nafn á veitingastað eða hraðatakmörk á vegi.
     rules:
       title: Reglur!

+      paragraph_1_html: "OpenStreetMap er með fáar formlegar reglur en við væntum
+        þess og gerum kröfu um\nað allir þáttakendur starfi með og eigi samskipti
+        við OSM-samfélagið. Ef þú ert að íhuga aðgerðir\naðrar en handvirkar breytingar,
+        ættirðu að lesa og fylgja leiðbeiningunum á síðunum \n<a href='https://wiki.openstreetmap.org/wiki/Import/Guidelines'>Innflutningur</a>
+        og \n<a href='https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>Sjálfvirkar
+        breytingar</a>."

     questions:
       title: Einhverjar spurningar?
     questions:
       title: Einhverjar spurningar?

+      paragraph_1_html: |-
+        OpenStreetMap er með ýmsar leiðir til að læra meira um verkefnið, spyrja og svara
+        spurningum, og ræða í hópum um málefni tengd kortagerð.
+        <a href='%{help_url}'>Fáðu aðstoð hér</a>.

     start_mapping: Hefja kortlagningu
     start_mapping: Hefja kortlagningu

+    add_a_note:
+      title: Enginn tími fyrir breytingar? Bættu við athugasemd!

   fixthemap:
     title: Tilkynna vandamál / Laga kortið
     how_to_help:
   fixthemap:
     title: Tilkynna vandamál / Laga kortið
     how_to_help:


@@ -957,33 +1167,81 @@ is:
       title: Önnur íhugunarefni
   help_page:
     title: Til að fá hjálp
       title: Önnur íhugunarefni
   help_page:
     title: Til að fá hjálp

+    introduction: |-
+      OpenStreetMap er með ýmsar leiðir til að læra meira um verkefnið, spyrja og svara
+      spurningum, og ræða í hópum um málefni tengd kortagerð.

     welcome:
       url: /velkomin
       title: Velkomin í OSM
     welcome:
       url: /velkomin
       title: Velkomin í OSM

+      description: Byrjaðu með þessum fljótlega leiðarvísi með helstu grunnatriðum
+        varðandi OpenStreetMap.

     beginners_guide:
     beginners_guide:

-      url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide
+      url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide

       title: Byrjenda-leiðbeiningar
       title: Byrjenda-leiðbeiningar

+      description: Leiðarvísir fyrir byrjendur sem haldið er við af samfélaginu.

     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org
     help:
       url: https://help.openstreetmap.org/
       title: help.openstreetmap.org

+      description: Spyrðu spurninga eða flettu upp svörum á spyrja/svara hluta OSM-vefsvæðisins.

     mailing_lists:
       title: Póstlistar
     mailing_lists:
       title: Póstlistar

+      description: Spyrðu spurninga eða spjallaðu um áhugaverð málefni á einhverjum
+        af fjölmörgum póstlistum tengdum tungumálum eða viðfangsefnum.

     forums:
       title: Spjallsvæði
     forums:
       title: Spjallsvæði

+      description: Spurningar og umræður fyrir þá sem kunna betur við klassísk viðmót
+        hefðbundinna spjallborða.

     irc:
       title: IRC
     irc:
       title: IRC

+      description: Gagnvirkt spjall á mörgum tungumálum og um margvísleg málefni.

     switch2osm:
       title: switch2osm
     switch2osm:
       title: switch2osm

+      description: Hjálp fyrir fyrirtæki, stofnanir og félagasamtök sem ætla sér að
+        skipta yfir í kort byggð á OpenStreetMap og tengdum þjónustum.

     wiki:
     wiki:

-      url: http://wiki.openstreetmap.org/
+      url: https://wiki.openstreetmap.org/

       title: wiki.openstreetmap.org
       title: wiki.openstreetmap.org

+      description: Vafraðu um wiki/kvikuna til að sjá greinargóðar leiðbeiningar varðandi
+        OSM.

   about_page:
     next: Næsta
   about_page:
     next: Næsta

-    copyright_html: <span>&copy;</span>OpenStreetMap<br>þátttakendur
+    copyright_html: <span>&copy;</span>Þátttakendur í<br>OpenStreetMap<br>verkefninu
+    used_by: '%{name} drífur áfram kortagögn á þúsundum vefsíðna, símaforritum og
+      tækjum'
+    lede_text: OpenStreetMap er byggt upp af heilu samfélagi kortagerðarfólks sem
+      leggur inn og viðheldur gögnum um vegi, stíga, kaffihús, járnbrautir og margt,
+      margt fleira, út um víða veröld.

     local_knowledge_title: Staðbundin þekking
     local_knowledge_title: Staðbundin þekking

+    local_knowledge_html: |-
+      OpenStreetMap leggur áherslu á staðbundna þekkingu. Þátttakendurnir nota
+      loftmyndir, GPS-tæki o.þ.h. til jafns við frumstæðar kortaskissur til að sannreyna að OSM
+      sé nákvæmt og vel uppfært.

     community_driven_title: Samfélagsdrifið
     community_driven_title: Samfélagsdrifið

+    community_driven_html: |-
+      Samfélagið í kringum OpenStreetMap er fjölbreytilegt, áhugasamt og vex frá degi til dags.
+      Innan þess starfa áhugafólk um kortagerð, atvinnumenn í GIS-fræðum, verkfræðingar
+      sem meðal annars sjá um vefþjóna OSM, hjálparstarfsfólk sem kortleggur hamfarasvæði,
+      og margir aðrir.
+      Til að fræðast betur um þetta samfélag, geturðu skoðað
+      <a href='https://blog.openstreetmap.org'>OpenStreetMap bloggið</a>,
+      <a href='%{diary_path}'>dagbækur notenda</a>,
+      <a href='https://blogs.openstreetmap.org/'>bloggsvæði þátttakenda</a> og
+      vefsvæði <a href='https://www.osmfoundation.org/'>OSM Foundation</a>.

     open_data_title: Opin gögn
     open_data_title: Opin gögn

-    legal_title: Lagalegt
+    open_data_html: |-
+      OpenStreetMap eru <i>opin gögn</i>: þér er heimilt að nota þetta í hvaða tilgangi sem er
+      svo framarlega að þú getir um OpenStreetMap og þátttakendurna í verkefninu. Ef þú breytir gögnunum
+      eða byggir á göngunum á einhvern máta, máttu einungis dreifa útkomunni
+      með sömu notkunarskilmálum. Skoðaðu síðuna um <a href='%{copyright_path}'>höfundarrétt og
+      notkunarleyfi</a> til að sjá ítarlegri upplýsingar varðandi þetta.
+    legal_title: Lagalegur fyrirvari
+    legal_html: "Þetta vefsvæði ásamt mörgum tengdum þjónustum er formlega rekið af\n<a
+      href='https://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF) \nfyrir
+      hönd samfélagsins. Notkun allrar þjónustu á vegum OSMF fellur undir \n<a href=\"https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">stefnu
+      okkar varðandi ásættanlega notkun</a> auk <a href=\"https://wiki.osmfoundation.org/wiki/Privacy_Policy\">persónuverndarstefnu
+      okkar</a>\n.<br> \nEndilega <a href='https://osmfoundation.org/Contact'>hafðu
+      samband við OSMF</a> \nef þú ert með spurningar eða beiðnir varðandi notkunarleyfi,
+      höfundarrétt eða önnur lögfræðileg málefni."

     partners_title: Samstarfsaðilar
   notifier:
     diary_comment_notification:
     partners_title: Samstarfsaðilar
   notifier:
     diary_comment_notification:


@@ -997,12 +1255,14 @@ is:
       subject_header: '[OpenStreetMap] %{subject}'
       hi: Hæ %{to_user},
       header: '%{from_user} hefur send þér skilaboð á OpenStreetMap með titlinum „%{subject}“:'
       subject_header: '[OpenStreetMap] %{subject}'
       hi: Hæ %{to_user},
       header: '%{from_user} hefur send þér skilaboð á OpenStreetMap með titlinum „%{subject}“:'

+      footer_html: Þú getur einnig lesið skilaboðin á %{readurl} og svarað á %{replyurl}

     friend_notification:
       hi: Hæ %{to_user},
       subject: '[OpenStreetMap] %{user} bætti þér við sem vin'
       had_added_you: Notandinn %{user} hefur bætt þér við sem vini á OpenStreetMap.
       see_their_profile: Þú getur séð notandasíðu notandans á %{userurl} og jafnvel
         bætt honum við sem vini líka.
     friend_notification:
       hi: Hæ %{to_user},
       subject: '[OpenStreetMap] %{user} bætti þér við sem vin'
       had_added_you: Notandinn %{user} hefur bætt þér við sem vini á OpenStreetMap.
       see_their_profile: Þú getur séð notandasíðu notandans á %{userurl} og jafnvel
         bætt honum við sem vini líka.

+      befriend_them: Þú getur líka bætt þeim við sem vinum á %{befriendurl}.

     gpx_notification:
       greeting: Hæ,
       your_gpx_file: GPX skráin þín
     gpx_notification:
       greeting: Hæ,
       your_gpx_file: GPX skráin þín


@@ -1014,7 +1274,7 @@ is:
         failed_to_import: 'Lenti í villu þegar átti að flytja hana inn, hérna er villan::'
         more_info_1: Frekari upplýsinagr um GPX innflutningarvillur og hvernig
         more_info_2: 'má forðast þær er að finna hér::'
         failed_to_import: 'Lenti í villu þegar átti að flytja hana inn, hérna er villan::'
         more_info_1: Frekari upplýsinagr um GPX innflutningarvillur og hvernig
         more_info_2: 'má forðast þær er að finna hér::'

-        import_failures_url: http://wiki.openstreetmap.org/index.php?title=FAQ&uselang=is
+        import_failures_url: https://wiki.openstreetmap.org/wiki/GPX_Import_Failures

       success:
         subject: '[OpenStreetMap] GPX skrá innflutt'
         loaded_successfully: var innflutt með %{trace_points} punkta af %{possible_points}
       success:
         subject: '[OpenStreetMap] GPX skrá innflutt'
         loaded_successfully: var innflutt með %{trace_points} punkta af %{possible_points}


@@ -1022,6 +1282,12 @@ is:
     signup_confirm:
       subject: '[OpenStreetMap] Velkomin í OpenStreetMap'
       greeting: Hæ þú!
     signup_confirm:
       subject: '[OpenStreetMap] Velkomin í OpenStreetMap'
       greeting: Hæ þú!

+      created: Einhver (vonandi þú) var að búa til notandaaðgang á %{site_url}.
+      confirm: 'Áður en nokkuð annað gerist, þurfum við að fá staðfestingu á að þessi
+        beiðni komi raunverulega frá þér, þannig að ef svo er skaltu smella á tengilinn
+        hér fyrir neðan til að staðfesta notandaaðganginn þinn:'
+      welcome: Eftir að þú hefur staðfest notandaaðganginn þinn, munum við senda þér
+        viðbótarupplýsingar til að koma þér í gang.

     email_confirm:
       subject: '[OpenStreetMap] Staðfestu netfangið þitt'
     email_confirm_plain:
     email_confirm:
       subject: '[OpenStreetMap] Staðfestu netfangið þitt'
     email_confirm_plain:


@@ -1053,19 +1319,28 @@ is:
     note_comment_notification:
       anonymous: Nafnlaus notandi
       greeting: Hæ,
     note_comment_notification:
       anonymous: Nafnlaus notandi
       greeting: Hæ,

+      details: Nánari upplýsingar um minnispunktinn er að finna á %{url}.

     changeset_comment_notification:
       hi: Hæ %{to_user},
       greeting: Hæ,
       commented:
         partial_changeset_without_comment: án athugasemdar
     changeset_comment_notification:
       hi: Hæ %{to_user},
       greeting: Hæ,
       commented:
         partial_changeset_without_comment: án athugasemdar

+      details: Nánari upplýsingar um breytingasettið er að finna á %{url}.

   message:
     inbox:
       title: Innhólf
       my_inbox: Innhólfið mitt
       outbox: úthólf
   message:
     inbox:
       title: Innhólf
       my_inbox: Innhólfið mitt
       outbox: úthólf

+      messages: Þú átt %{new_messages} og %{old_messages}
+      new_messages:
+        one: '%{count} ný skilaboð'
+        other: '%{count} ný skilaboð'
+      old_messages:
+        one: '%{count} eldri skilaboð'
+        other: '%{count} eldri skilaboð'

       from: Frá
       subject: Titill
       from: Frá
       subject: Titill

-      date: Döðlur
+      date: Dagsetning

       no_messages_yet: Þú hefur ekki fengið nein skilboð. Hví ekki að hafa samband
         við einhverja %{people_mapping_nearby_link}?
       people_mapping_nearby: nálæga notendur
       no_messages_yet: Þú hefur ekki fengið nein skilboð. Hví ekki að hafa samband
         við einhverja %{people_mapping_nearby_link}?
       people_mapping_nearby: nálæga notendur


@@ -1136,9 +1411,9 @@ is:
       user_page_link: notandasíðunni þinni
       anon_edits: (%{link})
       anon_edits_link_text: Finndu út afhverju.
       user_page_link: notandasíðunni þinni
       anon_edits: (%{link})
       anon_edits_link_text: Finndu út afhverju.

-      flash_player_required: Þú þarft Flash spilara til að nota Potlatch ritilinn.
-        Þú getur <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">sótt
-        niður Flash spilara frá Adobe.com</a> eða notað <a href="http://wiki.openstreetmap.org/index.php?uselang=is&title=Editing">aðra
+      flash_player_required: Þú þ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
         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


@@ -1154,7 +1429,7 @@ is:
       get_directions_title: Finna leiðir milli tveggja punkta
       from: Frá
       to: Til
       get_directions_title: Finna leiðir milli tveggja punkta
       from: Frá
       to: Til

-      where_am_i: Hvar er ég?
+      where_am_i: Hvar er þetta?

       where_am_i_title: Notar leitarvélina til að lýsa núverandi staðsetningu á kortinu
       submit_text: Byrja
     key:
       where_am_i_title: Notar leitarvélina til að lýsa núverandi staðsetningu á kortinu
       submit_text: Byrja
     key:


@@ -1169,11 +1444,14 @@ is:
           track: Slóði
           bridleway: Reiðstígur
           cycleway: Hjólaleið
           track: Slóði
           bridleway: Reiðstígur
           cycleway: Hjólaleið

+          cycleway_national: Hjólaleið á landsneti
+          cycleway_regional: Svæðisbundin hjólaleið
+          cycleway_local: Staðbundin hjólaleið

           footway: Gönguleið
           rail: Lestarteinar
           subway: Neðanjarðarlest
           tram:
           footway: Gönguleið
           rail: Lestarteinar
           subway: Neðanjarðarlest
           tram:

-          - Smálest
+          - Léttlest

           - sporvagn
           cable:
           - Kláflyfta
           - sporvagn
           cable:
           - Kláflyfta


@@ -1228,7 +1506,7 @@ is:
       edit: Breyta
       preview: Forskoðun
     markdown_help:
       edit: Breyta
       preview: Forskoðun
     markdown_help:

-      title_html: Þáttað með <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
+      title_html: Þáttað með <a href="https://daringfireball.net/projects/markdown/">Markdown</a>

       headings: Fyrirsagnir
       heading: Fyrirsögn
       subheading: Undirfyrirsögn
       headings: Fyrirsagnir
       heading: Fyrirsögn
       subheading: Undirfyrirsögn


@@ -1270,7 +1548,7 @@ is:
       save_button: Vista breytingar
       visibility: 'Sýnileiki:'
       visibility_help: hvað þýðir þetta?
       save_button: Vista breytingar
       visibility: 'Sýnileiki:'
       visibility_help: hvað þýðir þetta?

-      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
+      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces

     trace_form:
       upload_gpx: 'Hlaða inn GPX skrá:'
       description: 'Lýsing:'
     trace_form:
       upload_gpx: 'Hlaða inn GPX skrá:'
       description: 'Lýsing:'


@@ -1278,10 +1556,10 @@ is:
       tags_help: aðskilið með kommum
       visibility: 'Sýnileiki:'
       visibility_help: hvað þýðir þetta
       tags_help: aðskilið með kommum
       visibility: 'Sýnileiki:'
       visibility_help: hvað þýðir þetta

-      visibility_help_url: http://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces
+      visibility_help_url: https://wiki.openstreetmap.org/wiki/Visibility_of_GPS_traces

       upload_button: Senda
       help: Hjálp
       upload_button: Senda
       help: Hjálp

-      help_url: http://wiki.openstreetmap.org/index.php?title=Upload&uselang=is
+      help_url: https://wiki.openstreetmap.org/index.php?title=Upload&uselang=is

     trace_header:
       upload_trace: Senda inn feril
       see_all_traces: Sjá alla ferla
     trace_header:
       upload_trace: Senda inn feril
       see_all_traces: Sjá alla ferla


@@ -1350,16 +1628,28 @@ is:
     georss:
       title: OpenStreetMap GPS-ferlar
     description:
     georss:
       title: OpenStreetMap GPS-ferlar
     description:

+      description_with_count:
+        one: GPX-skrá með %{count} punkti frá %{user}
+        other: GPX-skrá með %{count} punktum frá %{user}

       description_without_count: GPX-skrá frá %{user}
   application:
     require_cookies:
       description_without_count: GPX-skrá frá %{user}
   application:
     require_cookies:

-      cookies_needed: Þú virðist ekki vera með stuðning fyrir smákökur í vafranum
-        þínum. Þú verður að virkja þann stuðning áður en þú getur haldið áfrám.
+      cookies_needed: Þú virðist ekki vera með stuðning við vefkökur í vafranum þínum.
+        Þú verður að virkja þann stuðning áður en þú getur haldið áfram.
+    require_moderator:
+      not_a_moderator: Þú þarft að vera ritstjóri til að framkvæma þessa aðgerð.

     setup_user_auth:
     setup_user_auth:

-      blocked: Aðgangur þinn að forritunarviðmótinu hefur verið bannaður. Skráðu þig
-        inn í vefviðmótið fyrir frekari upplýsingar.
+      blocked_zero_hour: Þú átt áríðandi skilaboð á OpenStreetMap vefsvæðinu. Þú verður
+        að lesa þessi skilaboð áður en þú getur aftur vistað neinar breytingar.
+      blocked: Aðgangur þinn að API-forritunarviðmótinu hefur verið bannaður. Skráðu
+        þig inn í vefviðmótið fyrir frekari upplýsingar.
+      need_to_see_terms: Aðgangur þinn að API-forritunarviðmótinu hefur verið frystur
+        tímabundið. Skráðu þig inn í vefviðmótið til að skoða skilmála vegna framlags
+        (Contributor Terms). Þú þarft ekki endilega að samþykkja þá, en þú verður
+        að skoða þá.

   oauth:
     oauthorize:
   oauth:
     oauthorize:

+      title: Auðkenndu aðgang að notandaaðganginum þínum

       request_access: Forritið %{app_name} hefur óskað eftir að fá aðgang að OpenStreetMap
         í gegnum notandaaðganginn þinn, %{user}. Merktu við hvað eiginleika þú vilt
         gefa forritinu leyfi fyrir. Hægt er að haka við hvaða eiginleika sem er.
       request_access: Forritið %{app_name} hefur óskað eftir að fá aðgang að OpenStreetMap
         í gegnum notandaaðganginn þinn, %{user}. Merktu við hvað eiginleika þú vilt
         gefa forritinu leyfi fyrir. Hægt er að haka við hvaða eiginleika sem er.


@@ -1375,9 +1665,15 @@ is:
       grant_access: Veita aðgang
     oauthorize_success:
       title: Auðkenningarbeiðni samþykkt
       grant_access: Veita aðgang
     oauthorize_success:
       title: Auðkenningarbeiðni samþykkt

+      allowed: Þú hefur veitt forritinu %{app_name} aðgang að notandaaðganginum þínum.

       verification: Sannvottunarkóðinn er %{code}.
     oauthorize_failure:
       title: Auðkenningarbeiðni brást
       verification: Sannvottunarkóðinn er %{code}.
     oauthorize_failure:
       title: Auðkenningarbeiðni brást

+      denied: Þú hefur neitað forritinu %{app_name} um aðgang að notandaaðganginum
+        þínum.
+      invalid: Auðkenningarteiknið er ekki gilt.
+    revoke:
+      flash: Þú afturkallaðir aðgangsteiknið fyrir %{application}

   oauth_clients:
     new:
       title: Skrá nýtt forrit
   oauth_clients:
     new:
       title: Skrá nýtt forrit


@@ -1387,7 +1683,12 @@ is:
       submit: Breyta
     show:
       title: OAuth stillingar fyrir %{app_name}
       submit: Breyta
     show:
       title: OAuth stillingar fyrir %{app_name}

+      key: 'Lykill notanda:'
+      secret: 'Leyniorð notanda:'
+      url: 'Slóð á beiðniteikn:'
+      access_url: 'Slóð á aðgangsteikn:'

       authorize_url: 'Leyfa slóð (URL):'
       authorize_url: 'Leyfa slóð (URL):'

+      support_notice: Við styðjum HMAC-SHA1 (mælt með) og RSA-SHA1 undirritanir.

       edit: Breyta þessari skráningu
       delete: Eyða biðlara
       confirm: Ertu viss?
       edit: Breyta þessari skráningu
       delete: Eyða biðlara
       confirm: Ertu viss?


@@ -1402,10 +1703,13 @@ is:
       allow_write_notes: Breyta minnispunktum.
     index:
       title: OAuth stillingar
       allow_write_notes: Breyta minnispunktum.
     index:
       title: OAuth stillingar

+      my_tokens: Auðkenndu forritin mín
+      list_tokens: 'Eftirfarandi aðgangsteikn hafa verðið gefin út í þínu nafni til
+        handa forritum:'

       application: Heiti forrits
       issued_at: Gefið út þann
       revoke: Eyða banninu
       application: Heiti forrits
       issued_at: Gefið út þann
       revoke: Eyða banninu

-      my_apps: Mín forrit
+      my_apps: Forritin mín

       registered_apps: 'Þú hefur skráð eftirfarandi forrit:'
       register_new: Skrá nýtt forrit
     form:
       registered_apps: 'Þú hefur skráð eftirfarandi forrit:'
       register_new: Skrá nýtt forrit
     form:


@@ -1418,8 +1722,11 @@ is:
       allow_write_diary: Búa til bloggfærslur, setja inn athugasemdir og bæta við
         vinum.
       allow_write_api: breyta kortagögnunum.
       allow_write_diary: Búa til bloggfærslur, setja inn athugasemdir og bæta við
         vinum.
       allow_write_api: breyta kortagögnunum.

+      allow_read_gpx: lesa einka-GPS-ferlana þeirra.

       allow_write_gpx: Senda inn GPS ferla.
       allow_write_notes: breyta minnispunktum.
       allow_write_gpx: Senda inn GPS ferla.
       allow_write_notes: breyta minnispunktum.

+    not_found:
+      sorry: Því miður, þessi %{type} fannst ekki.

     create:
       flash: Nýtt OAuth forrit hefur verið skráð
   user:
     create:
       flash: Nýtt OAuth forrit hefur verið skráð
   user:


@@ -1433,11 +1740,20 @@ is:
       lost password link: Gleymdirðu lykilorðinu þínu?
       login_button: Innskrá
       register now: Skrá þig núna
       lost password link: Gleymdirðu lykilorðinu þínu?
       login_button: Innskrá
       register now: Skrá þig núna

+      with username: 'Ertu þegar með OpenStreetMap-aðgang? Skráðu þig inn með notandanafni
+        og lykilorði:'
+      with external: 'Þú getur líka notað utanaðkomandi þjónustur til innskráningar:'

       new to osm: Nýr í OpenStreetMap?
       new to osm: Nýr í OpenStreetMap?

+      to make changes: Til að gera breytingar í OpenStreetMap verðurðu að vera með
+        notandaaðgang.
+      create account minute: Stofnaðu aðgang. Það tekur eina mínútu.

       no account: Ertu ekki með aðgang?
       account not active: Þessi reikningur er ekki virkur.<br />Vinsamlegast smelltu
         á tengilinn í staðfestingarpóstinum sem þú fékkst til að virkja reikninginn,
         eða <a href="%{reconfirm}">óskaðu eftir nýjum staðfestingarpósti</a>.
       no account: Ertu ekki með aðgang?
       account not active: Þessi reikningur er ekki virkur.<br />Vinsamlegast smelltu
         á tengilinn í staðfestingarpóstinum sem þú fékkst til að virkja reikninginn,
         eða <a href="%{reconfirm}">óskaðu eftir nýjum staðfestingarpósti</a>.

+      account is suspended: Því miður, notandaaðgangurinn þinn hefur verið frystur
+        vegna grunsamlegrar virkni.<br />Hafðu samband við <a href="%{webmaster}">vefstjóra</a>
+        ef þú vilt ræða þetta mál.

       auth failure: Þetta notandanafn eða lykilorð er rangt.
       openid_logo_alt: Skrá inn með OpenID-aðgangi
       auth_providers:
       auth failure: Þetta notandanafn eða lykilorð er rangt.
       openid_logo_alt: Skrá inn með OpenID-aðgangi
       auth_providers:


@@ -1475,7 +1791,7 @@ is:
     lost_password:
       title: Glatað lykilorð
       heading: Gleymt lykilorð?
     lost_password:
       title: Glatað lykilorð
       heading: Gleymt lykilorð?

-      email address: 'Netfang:'
+      email address: 'Tölvupóstfang:'

       new password button: Senda nýtt lykilorð á netfangið þitt
       help_text: Sláðu inn netfangið sem þú skráðir þig með, við munum senda tengil
         á það sem þú getur notað til að breyta lykilorðinu þínu.
       new password button: Senda nýtt lykilorð á netfangið þitt
       help_text: Sláðu inn netfangið sem þú skráðir þig með, við munum senda tengil
         á það sem þú getur notað til að breyta lykilorðinu þínu.


@@ -1497,12 +1813,16 @@ is:
         að fá reikning búinn til.
       about:
         header: Frjálst og breytanlegt
         að fá reikning búinn til.
       about:
         header: Frjálst og breytanlegt

-      license_agreement: Með því að staðfesta notandaaðgang, samþykkirðu <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">skilmálana
+        html: |-
+          <p>Ólíkt öðrum landakortum, er OpenStreetMap gert frá grunni af fólki eins og þér,
+          öllum er heimilt að laga það, uppfæra, sækja og nota.</p>
+          <p>Skráðu þig sem notanda til að geta tekið þátt. Við munum senda þér tölvupóst til staðfestingar á skráningunni.</p>
+      license_agreement: Með því að staðfesta notandaaðganginn, samþykkirðu <a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">skilmálana

         vegna framlaga</a>.
         vegna framlaga</a>.

-      email address: 'Netfang:'
+      email address: 'Tölvupóstfang:'

       confirm email address: 'Staðfestu netfang:'
       not displayed publicly: Netfangið þitt er ekki birt opinberlega, sjá kaflann
       confirm email address: 'Staðfestu netfang:'
       not displayed publicly: Netfangið þitt er ekki birt opinberlega, sjá kaflann

-        <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy" title=Meðferð
+        <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title=Meðferð

         OSMF á persónuupplýsingum, þar með töldum netföngum">um meðferð persónuupplýsinga</a>
       display name: 'Sýnilegt nafn:'
       display name description: Nafn þitt sem aðrir notendur sjá, þú getur breytt
         OSMF á persónuupplýsingum, þar með töldum netföngum">um meðferð persónuupplýsinga</a>
       display name: 'Sýnilegt nafn:'
       display name description: Nafn þitt sem aðrir notendur sjá, þú getur breytt


@@ -1510,19 +1830,23 @@ is:
       external auth: 'Auðkenning með þriðja aðila:'
       password: 'Lykilorð:'
       confirm password: 'Staðfestu lykilorðið:'
       external auth: 'Auðkenning með þriðja aðila:'
       password: 'Lykilorð:'
       confirm password: 'Staðfestu lykilorðið:'

+      use external auth: Þú getur líka notað utanaðkomandi þjónustur til innskráningar

       continue: Nýskrá
       terms accepted: Bestu þakkir fyrir að samþykkja nýju skilmálana vegna framlags
         þíns!
       continue: Nýskrá
       terms accepted: Bestu þakkir fyrir að samþykkja nýju skilmálana vegna framlags
         þíns!

-      terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
+      terms declined: Okkur þykir miður að þú hafir ákveðið að samþykkja ekki nýja
+        skilmála vegna framlags (contributor terms). Til að sjá ítarlegri upplýsingar,
+        geturðu skoðað <a href="%{url}">þessa síðu</a>.
+      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: Skilmálar vegna framlags
       heading: Skilmálar vegna framlags
       consider_pd: Til viðbótar við ofangreint samkomulag, lít ég svo á að framlög
         mín verði í almenningseigu (Public Domain)
       consider_pd_why: hvað þýðir þetta?
     terms:
       title: Skilmálar vegna framlags
       heading: Skilmálar vegna framlags
       consider_pd: Til viðbótar við ofangreint samkomulag, lít ég svo á að framlög
         mín verði í almenningseigu (Public Domain)
       consider_pd_why: hvað þýðir þetta?

-      consider_pd_why_url: http://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain
+      consider_pd_why_url: https://www.osmfoundation.org/wiki/License/Why_would_I_want_my_contributions_to_be_public_domain

       agree: Samþykkja
       agree: Samþykkja

-      declined: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
+      declined: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

       decline: Hafna
       you need to accept or decline: Endilega lestu og samþykktu eða hafnaðu nýju
         skilmálunum vegna framlags þíns, áður en þú heldur áfram.
       decline: Hafna
       you need to accept or decline: Endilega lestu og samþykktu eða hafnaðu nýju
         skilmálunum vegna framlags þíns, áður en þú heldur áfram.


@@ -1616,12 +1940,12 @@ is:
       email never displayed publicly: (aldrei sýnt opinberlega)
       external auth: 'Ytri auðkenning:'
       openid:
       email never displayed publicly: (aldrei sýnt opinberlega)
       external auth: 'Ytri auðkenning:'
       openid:

-        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link: https://wiki.openstreetmap.org/wiki/OpenID

         link text: hvað er openID?
       public editing:
         heading: 'Ónafngreindur notandi?:'
         enabled: Nei, nafngreindur og getur breytt gögnum.
         link text: hvað er openID?
       public editing:
         heading: 'Ónafngreindur notandi?:'
         enabled: Nei, nafngreindur og getur breytt gögnum.

-        enabled link: http://wiki.openstreetmap.org/index.php?uselang=is&title=Anonymous_edits
+        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.
         enabled link text: Hvað er þetta?
         disabled: Óvirkur og getur ekki breytt gögnum, allar fyrri breytingar eru
           ónafngreindar.


@@ -1629,9 +1953,14 @@ is:
       public editing note:
         heading: Nafngreindar breytingar
         text: Breytingarnar þínar eru núna ónafngreindar þannig að aðrir notendur
       public editing note:
         heading: Nafngreindar breytingar
         text: Breytingarnar þínar eru núna ónafngreindar þannig að aðrir notendur

-          geta ekki sent þér skilaboð eða séð staðsetningu þína. Þú verður að vera
-          nafngreind(ur) til að geta notað vefinn, sjá <a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">þessa
-          síðu</a> fyrir frekari upplýsingar.
+          geta ekki sent þér skilaboð eða séð staðsetningu þína. Til þess að breytingar
+          þínar sjáist og að fólk geti haft samband við þig í gegnum vefsvæðið, smelltu
+          þá á hnappinn hér fyrir neðan. <b>Eftir að breytingar urðu vegna 0.6 API
+          forritunarviðmótsins, geta einungis opinberir notendur breytt kortagögnum</b>.
+          (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">sjáðu hvers
+          vegna</a>).<ul><li>Þótt þú gerist opinber notandi, verður netfangið þitt
+          ekki birt opinberlega.</li><li>Þessa aðgerð er ekki hægt að afturkalla og
+          allir nýir notendur eru sjálfgefið opinberir.</li></ul>

       contributor terms:
         heading: 'Skilmálar vegna framlags:'
         agreed: Þú hefur samþykkt nýju skilmálana vegna framlags þíns.
       contributor terms:
         heading: 'Skilmálar vegna framlags:'
         agreed: Þú hefur samþykkt nýju skilmálana vegna framlags þíns.


@@ -1641,7 +1970,7 @@ is:
           skilmálana vegna framlags þíns.
         agreed_with_pd: Þú hefur einnig lýst því yfir að breytingar þínar verði í
           almenningseigu (Public Domain).
           skilmálana vegna framlags þíns.
         agreed_with_pd: Þú hefur einnig lýst því yfir að breytingar þínar verði í
           almenningseigu (Public Domain).

-        link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms

         link text: Hvað er þetta?
       profile description: 'Lýsing á þér:'
       preferred languages: 'Viðmótstungumál:'
         link text: Hvað er þetta?
       profile description: 'Lýsing á þér:'
       preferred languages: 'Viðmótstungumál:'


@@ -1649,7 +1978,7 @@ is:
       image: 'Mynd:'
       gravatar:
         gravatar: Nota Gravatar-auðkennismynd
       image: 'Mynd:'
       gravatar:
         gravatar: Nota Gravatar-auðkennismynd

-        link: http://wiki.openstreetmap.org/wiki/Gravatar
+        link: https://wiki.openstreetmap.org/wiki/Gravatar

         link text: Hvað er þetta?
         disabled: Gravatar-auðkennismynd hefur verið gerð óvirk.
         enabled: Birting Gravatar-auðkennismyndar hefur verið gerð virk.
         link text: Hvað er þetta?
         disabled: Gravatar-auðkennismynd hefur verið gerð óvirk.
         enabled: Birting Gravatar-auðkennismyndar hefur verið gerð virk.


@@ -1673,7 +2002,8 @@ is:
     confirm:
       heading: Athuga með tölvupóstinn þinn!
       introduction_1: Við höfum sent þér staðfestingartölvupóst.
     confirm:
       heading: Athuga með tölvupóstinn þinn!
       introduction_1: Við höfum sent þér staðfestingartölvupóst.

-      press confirm button: Hér getur þú staðfest að þú viljir búa til notanda..
+      press confirm button: Hér getur þú staðfest að þú viljir virkja notandaaðganginn
+        þinn.

       button: Staðfesta
       success: Notandinn þinn hefur verið staðfestur.
       already active: Þessi notandaaðgangur hefur þegar verið staðfestur.
       button: Staðfesta
       success: Notandinn þinn hefur verið staðfestur.
       already active: Þessi notandaaðgangur hefur þegar verið staðfestur.


@@ -1705,6 +2035,9 @@ is:
     list:
       title: Notendur
       heading: Notendur
     list:
       title: Notendur
       heading: Notendur

+      showing:
+        one: Síða %{page} (%{first_item} af %{items})
+        other: Síða %{page} (%{first_item}-%{last_item} af %{items})

       confirm: Staðfesta valda notendur
       hide: Fela valda notendur
       empty: Engir samsvarandi notendur fundust
       confirm: Staðfesta valda notendur
       hide: Fela valda notendur
       empty: Engir samsvarandi notendur fundust


@@ -1714,6 +2047,7 @@ is:
       webmaster: vefstjóri
     auth_failure:
       no_authorization_code: Enginn auðkenningarkóði
       webmaster: vefstjóri
     auth_failure:
       no_authorization_code: Enginn auðkenningarkóði

+      unknown_signature_algorithm: Óþekkt reiknirit undirritunar

       invalid_scope: Ógilt notkunarsvið
   user_role:
     filter:
       invalid_scope: Ógilt notkunarsvið
   user_role:
     filter:


@@ -1750,6 +2084,7 @@ is:
       reason: 'Gefðu ástæðu fyrir því að þú viljir banna %{name}:'
       period: Hversu lengi á að banna notandann frá því að nota forritunarviðmótið?
       submit: Banna notandann
       reason: 'Gefðu ástæðu fyrir því að þú viljir banna %{name}:'
       period: Hversu lengi á að banna notandann frá því að nota forritunarviðmótið?
       submit: Banna notandann

+      tried_contacting: Ég hef haft samband við notandann og beðið hann að hætta.

       needs_view: Notandinn þarf að innskrá sig áður en bannið fellur úr gildi.
       back: Listi yfir öll bönn
     edit:
       needs_view: Notandinn þarf að innskrá sig áður en bannið fellur úr gildi.
       back: Listi yfir öll bönn
     edit:


@@ -1799,7 +2134,9 @@ is:
       previous: « Fyrri
     helper:
       time_future: Endar eftir %{time}
       previous: « Fyrri
     helper:
       time_future: Endar eftir %{time}

-      until_login: Virkt þangað til notandinn innskráir sig.
+      until_login: Virkt þangað til notandinn skráir sig inn.
+      time_future_and_until_login: Endar eftir %{time} og eftir að notandinn skráir
+        sig inn.

       time_past: Endaði fyrir %{time} síðan
     blocks_on:
       title: Bönn gegn %{name}
       time_past: Endaði fyrir %{time} síðan
     blocks_on:
       title: Bönn gegn %{name}


@@ -1837,6 +2174,7 @@ is:
       reopened_at_by_html: Endurvirkjað fyrir %{when} síðan af %{user}
     rss:
       title: Minnispunktar OpenStreetMap
       reopened_at_by_html: Endurvirkjað fyrir %{when} síðan af %{user}
     rss:
       title: Minnispunktar OpenStreetMap

+      description_item: RSS-streymi fyrir minnispunkt %{id}

       opened: nýr minnispunktur (nálægt %{place})
       commented: ný athugasemd (nálægt %{place})
       closed: lokaður minnispunktur (nálægt %{place})
       opened: nýr minnispunktur (nálægt %{place})
       commented: ný athugasemd (nálægt %{place})
       closed: lokaður minnispunktur (nálægt %{place})


@@ -1894,7 +2232,7 @@ is:
         data: Gögn korts
         gps: Opinberir GPS-ferlar
         title: Lög
         data: Gögn korts
         gps: Opinberir GPS-ferlar
         title: Lög

-      copyright: © <a href='%{copyright_url}'>OpenStreetMap þátttakendur</a>
+      copyright: © <a href='%{copyright_url}'>Þáttakendur í OpenStreetMap verkefninu</a>

       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Styrkja verkefnið</a>
     site:
       edit_tooltip: Breyta kortinu
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Styrkja verkefnið</a>
     site:
       edit_tooltip: Breyta kortinu


@@ -1919,8 +2257,12 @@ is:
         hide: Fela
         resolve: Leysa
         reactivate: Virkja aftur
         hide: Fela
         resolve: Leysa
         reactivate: Virkja aftur

+        comment_and_resolve: Athugasemd & leysa

         comment: Athugasemd
         comment: Athugasemd

+    edit_help: Færðu kortið og stilltu aðdrátt inn á staðinn sem þú vilt breyta, smelltu
+      síðan hér.

     directions:
     directions:

+      ascend: Fara upp

       engines:
         graphhopper_bicycle: Reiðhjól (GraphHopper)
         graphhopper_car: Bíll (GraphHopper)
       engines:
         graphhopper_bicycle: Reiðhjól (GraphHopper)
         graphhopper_car: Bíll (GraphHopper)


@@ -1929,6 +2271,7 @@ is:
         mapquest_car: Bíll (MapQuest)
         mapquest_foot: Fótgangandi (MapQuest)
         osrm_car: Bíll (OSRM)
         mapquest_car: Bíll (MapQuest)
         mapquest_foot: Fótgangandi (MapQuest)
         osrm_car: Bíll (OSRM)

+      descend: Fara niður

       directions: Leiðir
       distance: Vegalengd
       errors:
       directions: Leiðir
       distance: Vegalengd
       errors:


@@ -1936,16 +2279,34 @@ is:
         no_place: Því miður, gat ekki fundið þennan stað.
       instructions:
         continue_without_exit: Haltu áfram á %{name}
         no_place: Því miður, gat ekki fundið þennan stað.
       instructions:
         continue_without_exit: Haltu áfram á %{name}

+        slight_right_without_exit: Beygðu lítillega til hægri yfir á %{name}

         endofroad_right_without_exit: Við enda vegarins skaltu beygja til hægri inn
           á %{name}
         turn_right_without_exit: Beygðu til hægri inn á %{name}
         sharp_right_without_exit: Kröpp hægribeygja inn á %{name}
         sharp_left_without_exit: Kröpp vinstribeygja inn á %{name}
         endofroad_right_without_exit: Við enda vegarins skaltu beygja til hægri inn
           á %{name}
         turn_right_without_exit: Beygðu til hægri inn á %{name}
         sharp_right_without_exit: Kröpp hægribeygja inn á %{name}
         sharp_left_without_exit: Kröpp vinstribeygja inn á %{name}

+        turn_left_without_exit: Beygðu til vinstri yfir á %{name}

         endofroad_left_without_exit: Við enda vegarins skaltu beygja til vinstri inn
           á %{name}
         endofroad_left_without_exit: Við enda vegarins skaltu beygja til vinstri inn
           á %{name}

+        slight_left_without_exit: Beygðu lítillega til vinstri yfir á %{name}
+        via_point_without_exit: (um punkt)

         follow_without_exit: Fylgja %{name}
         follow_without_exit: Fylgja %{name}

+        roundabout_without_exit: Í hringtorginu, beygðu á %{name}
+        leave_roundabout_without_exit: Farðu út úr hringtorginu - %{name}
+        stay_roundabout_without_exit: Vertu áfram á hringtorginu - %{name}

         start_without_exit: Byrjaðu við endann á %{name}
         destination_without_exit: Farðu á leiðarenda
         start_without_exit: Byrjaðu við endann á %{name}
         destination_without_exit: Farðu á leiðarenda

+        against_oneway_without_exit: Farðu á móti einstefnu á %{name}
+        end_oneway_without_exit: Einstefna endar á %{name}
+        roundabout_with_exit: Í hringtorginu, beygðu útaf við %{exit} afrein yfir
+          á %{name}
+        turn_left_with_exit: Í hringtorginu, beygðu til vinstri yfir á %{name}
+        slight_left_with_exit: Í hringtorginu, beygðu lítillega til vinstri yfir á
+          %{name}
+        turn_right_with_exit: Í hringtorginu, beygðu til hægri yfir á %{name}
+        slight_right_with_exit: Í hringtorginu, beygðu lítillega til hægri yfir á
+          %{name}
+        continue_with_exit: Í hringtorginu, hltu beint áframi yfir á %{name}

         unnamed: ónefnd gata
         courtesy: Leiðarlýsing í boði %{link}
       time: Tími
         unnamed: ónefnd gata
         courtesy: Leiðarlýsing í boði %{link}
       time: Tími

diff --git a/config/locales/it.yml b/config/locales/it.yml
index a41c7e3de4ff5a91aab83c9f4ac5491b0f66c674..0aa002bbefa57a205b9921c6051fa2a6415f8188 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -380,7 +380,7 @@ it:
       map_image: Immagine Mappa (mostra livello standard)
       embeddable_html: HTML incapsulabile
       licence: Licenza
       map_image: Immagine Mappa (mostra livello standard)
       embeddable_html: HTML incapsulabile
       licence: Licenza

-      export_details: I dati OpenStreetMap sono rilasciati con <a href="http://opendatacommons.org/licenses/odbl/1.0/">licenza
+      export_details: I dati OpenStreetMap sono rilasciati con <a href="https://opendatacommons.org/licenses/odbl/1.0/">licenza

         Open Data Commons Open Database</a> (ODbL).
       too_large:
         advice: 'Se le esportazioni riportate sopra non riescono, prova con una delle
         Open Data Commons Open Database</a> (ODbL).
       too_large:
         advice: 'Se le esportazioni riportate sopra non riescono, prova con una delle


@@ -420,14 +420,14 @@ it:
   geocoder:
     search:
       title:
   geocoder:
     search:
       title:

-        latlon: Risultati da <a href="http://openstreetmap.org/">Internal</a>
+        latlon: Risultati da <a href="https://openstreetmap.org/">Internal</a>

         uk_postcode: Risultati da <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
           Postcode</a>
         uk_postcode: Risultati da <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
           Postcode</a>

-        ca_postcode: Risultati da <a href="http://geocoder.ca/">Geocoder.CA</a>
-        osm_nominatim: Risultati restituiti da <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        ca_postcode: Risultati da <a href="https://geocoder.ca/">Geocoder.CA</a>
+        osm_nominatim: Risultati restituiti da <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a>
         geonames: Risultati da <a href="http://www.geonames.org/">GeoNames</a>
           Nominatim</a>
         geonames: Risultati da <a href="http://www.geonames.org/">GeoNames</a>

-        osm_nominatim_reverse: Risultati restituiti da <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim_reverse: Risultati restituiti da <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a>
         geonames_reverse: Risultati da <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
           Nominatim</a>
         geonames_reverse: Risultati da <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:


@@ -950,7 +950,7 @@ it:
         level10: Confine amministrativo 10º livello - Subcittadino, quartiere
     description:
       title:
         level10: Confine amministrativo 10º livello - Subcittadino, quartiere
     description:
       title:

-        osm_nominatim: Località da <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim: Località da <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a>
         geonames: Località da <a href="http://www.geonames.org/">GeoNames</a>
       types:
           Nominatim</a>
         geonames: Località da <a href="http://www.geonames.org/">GeoNames</a>
       types:


@@ -1026,20 +1026,20 @@ it:
       title_html: Copyright e licenza
       intro_1_html: |-
         OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> è <i>open data</i>, e i suoi dati sono distribuiti con licenza <a
       title_html: Copyright e licenza
       intro_1_html: |-
         OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup> è <i>open data</i>, e i suoi dati sono distribuiti con licenza <a

-        href="http://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL) dalla <a href="http://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).
+        href="https://opendatacommons.org/licenses/odbl/">Open Data Commons Open Database License</a> (ODbL) dalla <a href="https://osmfoundation.org/">OpenStreetMap Foundation</a> (OSMF).

       intro_2_html: "Sei libero di copiare, distribuire, trasmettere e adattare i
         nostri dati, finché lo attribuisci a OpenStreetMap e ai suoi contributori.
         Se alteri o ti basi sui nostri dati,\npuoi distribuire il risultato solo sotto
       intro_2_html: "Sei libero di copiare, distribuire, trasmettere e adattare i
         nostri dati, finché lo attribuisci a OpenStreetMap e ai suoi contributori.
         Se alteri o ti basi sui nostri dati,\npuoi distribuire il risultato solo sotto

-        la stessa licenza. Il \n<a href=\"http://opendatacommons.org/licenses/odbl/1.0/\">codice\nlegale
+        la stessa licenza. Il \n<a href=\"https://opendatacommons.org/licenses/odbl/1.0/\">codice\nlegale

         completo</a> illustra i tuoi diritti e le tue responsabilità."
       intro_3_html: "La cartografia contenuta nelle nostre tavole, e la nostra documentazione,
         completo</a> illustra i tuoi diritti e le tue responsabilità."
       intro_3_html: "La cartografia contenuta nelle nostre tavole, e la nostra documentazione,

-        sono rilasciate sotto licenza <a href=\"http://creativecommons.org/licenses/by-sa/2.0/\">Creative
-        \nCommons Attribuzione - Condividi allo stesso modo 2.0</a> (CC-BY-SA)."
+        sono rilasciate sotto licenza <a href=\"https://creativecommons.org/licenses/by-sa/2.0/\">Creative
+        \nCommons Attribuzione - Condividi allo stesso modo 2.0</a> (CC BY-SA)."

       credit_title_html: Come si attribuisce a OpenStreetMap
       credit_1_html: Si richiede che l'attribuzione sia &ldquo;&copy; OpenStreetMap
         contributors &rdquo;.
       credit_2_html: |-
       credit_title_html: Come si attribuisce a OpenStreetMap
       credit_1_html: Si richiede che l'attribuzione sia &ldquo;&copy; OpenStreetMap
         contributors &rdquo;.
       credit_2_html: |-

-        Inoltre devi specificare chiaramente che i dati sono disponibili sotto la Open Database Licese e, se usi le nostre tavole, che la cartografia è pubblicata con licenza CC-BY-SA. Puoi fare ciò mettendo un collegamento URL a <a href="http://www.openstreetmap.org/copyright">questa pagina di copyright</a>.
+        Inoltre devi specificare chiaramente che i dati sono disponibili sotto la Open Database Licese e, se usi le nostre tavole, che la cartografia è pubblicata con licenza CC BY-SA. Puoi fare ciò mettendo un collegamento URL a <a href="https://www.openstreetmap.org/copyright">questa pagina di copyright</a>.

         In alternativa, e necessariamente se stai distribuendo OSM sotto forma di dati, puoi citare e creare un collegamento diretto alle licenze. In mezzi di comunicazione dove i collegamenti URL non sono possibili (per esempio un'opera stampata), ti suggeriamo di indirizzare i lettori verso openstreetmap.org (magari esplicitando 'OpenStreetMap' come nome completo), verso opendatacommons.org e, se necessario, verso creativecommons.org.
       credit_3_html: |-
         In una mappa elettronica navigabile, i crediti devono essere mostrati nell'angolo della mappa.
         In alternativa, e necessariamente se stai distribuendo OSM sotto forma di dati, puoi citare e creare un collegamento diretto alle licenze. In mezzi di comunicazione dove i collegamenti URL non sono possibili (per esempio un'opera stampata), ti suggeriamo di indirizzare i lettori verso openstreetmap.org (magari esplicitando 'OpenStreetMap' come nome completo), verso opendatacommons.org e, se necessario, verso creativecommons.org.
       credit_3_html: |-
         In una mappa elettronica navigabile, i crediti devono essere mostrati nell'angolo della mappa.


@@ -1049,7 +1049,7 @@ it:
         title: Esempio di attribuzione
       more_title_html: Per saperne di più
       more_1_html: Per saperne di più su come utilizzare i nostri dati e come citarne
         title: Esempio di attribuzione
       more_title_html: Per saperne di più
       more_1_html: Per saperne di più su come utilizzare i nostri dati e come citarne

-        correttamente la fonte, consulta la pagina sulla <a href="http://osmfoundation.org/Licence">Licenza
+        correttamente la fonte, consulta la pagina sulla <a href="https://osmfoundation.org/Licence">Licenza

         OSMF</a>.
       more_2_html: |-
         Anche se i dati OpenStreetMap sono aperti, non possiamo fornire accesso alle API della mappa gratuitamente per terze parti.
         OSMF</a>.
       more_2_html: |-
         Anche se i dati OpenStreetMap sono aperti, non possiamo fornire accesso alle API della mappa gratuitamente per terze parti.


@@ -1062,10 +1062,10 @@ it:
         cartografiche nazionali o di altra fonte, tra cui:'
       contributors_at_html: |-
         <strong>Austria</strong>: contiene i dati della
         cartografiche nazionali o di altra fonte, tra cui:'
       contributors_at_html: |-
         <strong>Austria</strong>: contiene i dati della

-        <a href="http://data.wien.gv.at/">Stadt Wien</a> (sotto
-        <a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
-        <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> e
-        Land Tirol (sotto <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT con emendamenti</a>).
+        <a href="https://data.wien.gv.at/">Stadt Wien</a> (sotto
+        <a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>),
+        <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a> e
+        Land Tirol (sotto <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY AT con emendamenti</a>).

       contributors_ca_html: |-
         <strong>Canada</strong>: contiene i dati della
         GeoBase&reg;, GeoGratis (&copy; Department of Natural
       contributors_ca_html: |-
         <strong>Canada</strong>: contiene i dati della
         GeoBase&reg;, GeoGratis (&copy; Department of Natural


@@ -1073,16 +1073,16 @@ it:
         Resources Canada), e della StatCan (Geography Division,
         Statistics Canada).
       contributors_fi_html: |-
         Resources Canada), e della StatCan (Geography Division,
         Statistics Canada).
       contributors_fi_html: |-

-        <strong>Finlandia</strong>: Contiene dati dal
+        <strong>Finlandia</strong>: contiene dati dal

         National Land Survey of Finland's Topographic Database
         e di altri set di dati, in base alla
         National Land Survey of Finland's Topographic Database
         e di altri set di dati, in base alla

-        <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">licensa NLSFI</a>.
+        <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">licensa NLSFI</a>.

       contributors_fr_html: |-
         <strong>Francia</strong>: contiene dati provenienti dalla
         Direction Générale des Impôts.
       contributors_nl_html: |-
         <strong>Olanda</strong>: contiene dati &copy; AND, 2007
       contributors_fr_html: |-
         <strong>Francia</strong>: contiene dati provenienti dalla
         Direction Générale des Impôts.
       contributors_nl_html: |-
         <strong>Olanda</strong>: contiene dati &copy; AND, 2007

-        (<a href="http://www.and.com">www.and.com</a>)
+        (<a href="https://www.and.com">www.and.com</a>)

       contributors_nz_html: |-
         <strong>Nuova Zelanda</strong>: contiene i dati provenienti dalla
         Land Information New Zealand. Crown Copyright reserved.
       contributors_nz_html: |-
         <strong>Nuova Zelanda</strong>: contiene i dati provenienti dalla
         Land Information New Zealand. Crown Copyright reserved.


@@ -1102,7 +1102,7 @@ it:
       contributors_footer_1_html: |-
         Per ulteriori dettagli di queste e altre fonti che sono state utilizzate
         per aiutare a migliorare OpenStreetMap, consulta la <a
       contributors_footer_1_html: |-
         Per ulteriori dettagli di queste e altre fonti che sono state utilizzate
         per aiutare a migliorare OpenStreetMap, consulta la <a

-        href="http://wiki.openstreetmap.org/wiki/Contributors">pagina dei
+        href="https://wiki.openstreetmap.org/wiki/Contributors">pagina dei

         collaboratori</a> sul wiki di OpenStreetMap.
       contributors_footer_2_html: |-
         L'inserimento dei dati in OpenStreetMap non implica che il fornitore
         collaboratori</a> sul wiki di OpenStreetMap.
       contributors_footer_2_html: |-
         L'inserimento dei dati in OpenStreetMap non implica che il fornitore


@@ -1114,12 +1114,12 @@ it:
         senza esplicita autorizzazione dei titolare del copyright.
       infringement_2_html: |-
         Se ritieni che materiale protetto da copyright sia stato impropriamente aggiunto al database di OpenStreetMap o a questo sito, consulta la nostra
         senza esplicita autorizzazione dei titolare del copyright.
       infringement_2_html: |-
         Se ritieni che materiale protetto da copyright sia stato impropriamente aggiunto al database di OpenStreetMap o a questo sito, consulta la nostra

-         <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">procedura di rimozione per violazione del copyright</a> o segnalacelo direttamente alla nostra
+         <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">procedura di rimozione per violazione del copyright</a> o segnalacelo direttamente alla nostra

         <a href="http://dmca.openstreetmap.org/">pagina di segnalazione on-line</a>.
       trademarks_title_html: <span id="trademarks"></span>Marchi registrati
       trademarks_1_html: '"OpenStreetMap", il logo con la lente d''ingrandimento e
         "State of the Map" sono marchi registrati della <i>Fondazione OpenStreetMap</i>.
         <a href="http://dmca.openstreetmap.org/">pagina di segnalazione on-line</a>.
       trademarks_title_html: <span id="trademarks"></span>Marchi registrati
       trademarks_1_html: '"OpenStreetMap", il logo con la lente d''ingrandimento e
         "State of the Map" sono marchi registrati della <i>Fondazione OpenStreetMap</i>.

-        Se avete domande sull''uso dei marchi, inviatele al <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">gruppo
+        Se avete domande sull''uso dei marchi, inviatele al <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">gruppo

         di lavoro per le licenze</a>.'
   welcome_page:
     title: Benvenuto!
         di lavoro per le licenze</a>.'
   welcome_page:
     title: Benvenuto!


@@ -1152,8 +1152,8 @@ it:
       paragraph_1_html: "OpenStreetMap ha poche regole formali, ma ci aspettiamo che
         tutti i partecipanti collaborino e comunichino con la comunità. Se stai considerando
         qualsiasi altra attività oltre all'editing manuale, dovresti prima leggere
       paragraph_1_html: "OpenStreetMap ha poche regole formali, ma ci aspettiamo che
         tutti i partecipanti collaborino e comunichino con la comunità. Se stai considerando
         qualsiasi altra attività oltre all'editing manuale, dovresti prima leggere

-        le linee guida sulle <a href=\"http://wiki.openstreetmap.org/wiki/IT:Import/Guidelines\">importazioni</a>
-        e \n<a href=\"http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct\">modifiche
+        le linee guida sulle <a href=\"https://wiki.openstreetmap.org/wiki/IT:Import/Guidelines\">importazioni</a>
+        e \n<a href=\"https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct\">modifiche

         automatiche</a> e seguire le loro indicazioni."
     questions:
       title: Domande?
         automatiche</a> e seguire le loro indicazioni."
     questions:
       title: Domande?


@@ -1188,7 +1188,7 @@ it:
       title: Ulteriori dubbi
       explanation_html: Se hai dubbi su come i nostri dati vengono utilizzati consulta
         la nostra <a href='/copyright'>pagina sulle licenze</a> per ulteriori informazioni
       title: Ulteriori dubbi
       explanation_html: Se hai dubbi su come i nostri dati vengono utilizzati consulta
         la nostra <a href='/copyright'>pagina sulle licenze</a> per ulteriori informazioni

-        legali, oppure contatta <a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>il
+        legali, oppure contatta <a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>il

         gruppo di lavoro OSMF</a>.
   help_page:
     title: Come ottenere aiuto
         gruppo di lavoro OSMF</a>.
   help_page:
     title: Come ottenere aiuto


@@ -1200,7 +1200,7 @@ it:
       title: Benvenuti in OSM
       description: Inizia con questa guida rapida che copre le basi di OpenStreetMap.
     beginners_guide:
       title: Benvenuti in OSM
       description: Inizia con questa guida rapida che copre le basi di OpenStreetMap.
     beginners_guide:

-      url: http://wiki.openstreetmap.org/wiki/IT:Beginners%27_guide
+      url: https://wiki.openstreetmap.org/wiki/IT:Beginners%27_guide

       title: Guida per Principianti
       description: Guida per i principianti gestita dalla community.
     help:
       title: Guida per Principianti
       description: Guida per i principianti gestita dalla community.
     help:


@@ -1224,7 +1224,7 @@ it:
       description: Aiuto per imprese e organizzazioni che intendono migrare a mappe
         e altri servizi basati su OpenStreetMap.
     wiki:
       description: Aiuto per imprese e organizzazioni che intendono migrare a mappe
         e altri servizi basati su OpenStreetMap.
     wiki:

-      url: http://wiki.openstreetmap.org/
+      url: https://wiki.openstreetmap.org/

       title: wiki.openstreetmap.org
       description: Sfoglia il wiki per la documentazione approfondita di OSM.
   about_page:
       title: wiki.openstreetmap.org
       description: Sfoglia il wiki per la documentazione approfondita di OSM.
   about_page:


@@ -1245,8 +1245,8 @@ it:
       GIS, ingegneri che gestiscono i server di OSM, mapping umanitario di aree soggette
       a disastri e molto altro. Per ulteriori informazioni sulla comunità, consulta
       il <a href='https://blog.openstreetmap.org'>blog OpenStreetMap</a>, i <a href='%{diary_path}'>diari
       GIS, ingegneri che gestiscono i server di OSM, mapping umanitario di aree soggette
       a disastri e molto altro. Per ulteriori informazioni sulla comunità, consulta
       il <a href='https://blog.openstreetmap.org'>blog OpenStreetMap</a>, i <a href='%{diary_path}'>diari

-      degli utenti</a>, il <a href='http://blogs.openstreetmap.org/'>blog della comunità</a>,
-      e il sito <a href='http://www.osmfoundation.org/'>OSM Foundation</a>.
+      degli utenti</a>, il <a href='https://blogs.openstreetmap.org/'>blog della comunità</a>,
+      e il sito <a href='https://www.osmfoundation.org/'>OSM Foundation</a>.

     open_data_title: Open Data
     open_data_html: 'OpenStreetMap è <i>open data</i>: sei libero di usarla per qualsiasi
       scopo a patto di attribuirla a OpenStreetMap e ai suoi contributori. Se alteri
     open_data_title: Open Data
     open_data_html: 'OpenStreetMap è <i>open data</i>: sei libero di usarla per qualsiasi
       scopo a patto di attribuirla a OpenStreetMap e ai suoi contributori. Se alteri


@@ -1255,11 +1255,11 @@ it:
       Copyright e Licenza</a> per i dettagli.'
     legal_title: Note legali
     legal_html: "Questo sito e molti altri servizi correlati sono formalmente gestiti
       Copyright e Licenza</a> per i dettagli.'
     legal_title: Note legali
     legal_html: "Questo sito e molti altri servizi correlati sono formalmente gestiti

-      dalla \n<a href=\"http://osmfoundation.org/\">OpenStreetMap Foundation</a> (OSMF)
-      \nper conto della comunità. L'uso di tutti i servizi gestiti dalla OSMF è soggetto
-      \nalle nostre <a href=\"http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\nregole
-      di utilizzo accettabile</a> ed alla nostra <a href=\"http://wiki.osmfoundation.org/wiki/Privacy_Policy\">informativa
-      sulla privacy</a>\n<br> \nSi prega di <a href=\"http://osmfoundation.org/Contact\">contattare
+      dalla \n<a href=\"https://osmfoundation.org/\">OpenStreetMap Foundation</a>
+      (OSMF) \nper conto della comunità. L'uso di tutti i servizi gestiti dalla OSMF
+      è soggetto \nalle nostre <a href=\"https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\nregole
+      di utilizzo accettabile</a> ed alla nostra <a href=\"https://wiki.osmfoundation.org/wiki/Privacy_Policy\">informativa
+      sulla privacy</a>\n<br> \nSi prega di <a href=\"https://osmfoundation.org/Contact\">contattare

       la OSMF</a> \nin caso di dubbi e problemi di licenza, copyright o altre questioni
       legali."
     partners_title: Partner
       la OSMF</a> \nin caso di dubbi e problemi di licenza, copyright o altre questioni
       legali."
     partners_title: Partner


@@ -1476,13 +1476,14 @@ it:
       user_page_link: pagina utente
       anon_edits_link_text: Leggi il perché.
       flash_player_required: È necessario un visualizzatore Flash per utilizzare Potlatch,
       user_page_link: pagina utente
       anon_edits_link_text: Leggi il perché.
       flash_player_required: È necessario un visualizzatore Flash per utilizzare Potlatch,

-        il programma Flash per le modifiche di OpenStreetMap. Si può <a href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">scaricare
-        il Flash Player da Adobe.com</a>. Sono disponibili anche <a href="http://wiki.openstreetmap.org/wiki/Editing">altre
+        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.)
         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 http://wiki.openstreetmap.org/wiki/The_Rails_Port
+      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
       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


@@ -1574,7 +1575,7 @@ it:
       edit: Modifica
       preview: Anteprima
     markdown_help:
       edit: Modifica
       preview: Anteprima
     markdown_help:

-      title_html: Analizzato con <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
+      title_html: Analizzato con <a href="https://daringfireball.net/projects/markdown/">Markdown</a>

       headings: Intestazioni
       heading: Intestazione
       subheading: Sottotitolo
       headings: Intestazioni
       heading: Intestazione
       subheading: Sottotitolo


@@ -1687,7 +1688,7 @@ it:
       description: Naviga fra i tracciati GPS caricati recentemente
       tagged_with: ' etichettati con %{tags}'
       empty_html: Ancora niente qui. <a href='%{upload_link}'>Carica una nuova traccia</a>
       description: Naviga fra i tracciati GPS caricati recentemente
       tagged_with: ' etichettati con %{tags}'
       empty_html: Ancora niente qui. <a href='%{upload_link}'>Carica una nuova traccia</a>

-        o leggi ulteriori informazioni sul tracciamento GPS nella <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>pagina
+        o leggi ulteriori informazioni sul tracciamento GPS nella <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>pagina

         wiki</a>.
     delete:
       scheduled_for_deletion: Tracciato in attesa di essere eliminato
         wiki</a>.
     delete:
       scheduled_for_deletion: Tracciato in attesa di essere eliminato


@@ -1901,12 +1902,12 @@ it:
           <p>A differenza di altre mappe, OpenStreetMap è completamente creato da persone come te
            ed è libero per chiunque per correggerlo, aggiornarlo, scaricarlo ed usarlo.</p>
           <p>Registrati per iniziare a contribuire. Ti invieremo un'email per confermare il tuo account.</p>
           <p>A differenza di altre mappe, OpenStreetMap è completamente creato da persone come te
            ed è libero per chiunque per correggerlo, aggiornarlo, scaricarlo ed usarlo.</p>
           <p>Registrati per iniziare a contribuire. Ti invieremo un'email per confermare il tuo account.</p>

-      license_agreement: Quando confermi il tuo profilo devi accettare le <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">regole
+      license_agreement: Quando confermi il tuo profilo devi accettare le <a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">regole

         per contribuire</a>.
       email address: 'Indirizzo email:'
       confirm email address: 'Conferma indirizzo email:'
       not displayed publicly: Il tuo indirizzo non visualizzato pubblicamente, vedi
         per contribuire</a>.
       email address: 'Indirizzo email:'
       confirm email address: 'Conferma indirizzo email:'
       not displayed publicly: Il tuo indirizzo non visualizzato pubblicamente, vedi

-        l'<a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF
+        l'<a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF

         privacy policy including section on email addresses">informativa sulla privacy</a>
         per ulteriori informazioni
       display name: 'Nome visualizzato:'
         privacy policy including section on email addresses">informativa sulla privacy</a>
         per ulteriori informazioni
       display name: 'Nome visualizzato:'


@@ -1924,6 +1925,7 @@ it:
       terms declined: Siamo spiacenti che tu abbia deciso di non accettare i nuovi
         termini di contribuzione. Per ulteriori informazioni consultare <a href="%{url}">questa
         pagina del wiki</a>.
       terms declined: Siamo spiacenti che tu abbia deciso di non accettare i nuovi
         termini di contribuzione. Per ulteriori informazioni consultare <a href="%{url}">questa
         pagina del wiki</a>.

+      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: Regole per contribuire
       heading: Regole per contribuire
     terms:
       title: Regole per contribuire
       heading: Regole per contribuire


@@ -2029,7 +2031,7 @@ it:
       email never displayed publicly: (mai visualizzato pubblicamente)
       external auth: 'Autenticazione Esterna:'
       openid:
       email never displayed publicly: (mai visualizzato pubblicamente)
       external auth: 'Autenticazione Esterna:'
       openid:

-        link: http://wiki.openstreetmap.org/wiki/IT:OpenID
+        link: https://wiki.openstreetmap.org/wiki/IT:OpenID

         link text: che cos'è questo?
       public editing:
         heading: 'Modifiche pubbliche:'
         link text: che cos'è questo?
       public editing:
         heading: 'Modifiche pubbliche:'


@@ -2045,7 +2047,7 @@ it:
           messaggi o vedere la tua posizione. Per rendere visibili le tue modifiche
           e per permettere agli altri utenti di contattarti tramite il sito, clicca
           sul pulsante sotto. <b>Dalla versione 0.6 delle API, soltanto gli utenti
           messaggi o vedere la tua posizione. Per rendere visibili le tue modifiche
           e per permettere agli altri utenti di contattarti tramite il sito, clicca
           sul pulsante sotto. <b>Dalla versione 0.6 delle API, soltanto gli utenti

-          pubblici possono modificare i dati della mappa</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">scopri
+          pubblici possono modificare i dati della mappa</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">scopri

           perché</a>).<ul><li>Il tuo indirizzo email non sarà reso pubblico.</li><li>Questa
           decisione non può essere revocata e tutti i nuovi utenti sono ora pubblici
           in modo predefinito.</li></ul>
           perché</a>).<ul><li>Il tuo indirizzo email non sarà reso pubblico.</li><li>Questa
           decisione non può essere revocata e tutti i nuovi utenti sono ora pubblici
           in modo predefinito.</li></ul>


@@ -2057,6 +2059,7 @@ it:
           accettare le nuove regole per contribuire.
         agreed_with_pd: Hai anche dichiarato di considerare le tue modifiche di Pubblico
           Dominio.
           accettare le nuove regole per contribuire.
         agreed_with_pd: Hai anche dichiarato di considerare le tue modifiche di Pubblico
           Dominio.

+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms

         link text: che cos'è questo?
       profile description: 'Descrizione del profilo:'
       preferred languages: 'Lingua preferita:'
         link text: che cos'è questo?
       profile description: 'Descrizione del profilo:'
       preferred languages: 'Lingua preferita:'

diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 35d85fd8ae846e453ed548fb94eb31b5d6347477..b95f3348e4eb358064bb563492133ea5a6425b65 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -2168,6 +2168,7 @@ ja:
       ascend: 上り坂
       engines:
         graphhopper_bicycle: 自転車
       ascend: 上り坂
       engines:
         graphhopper_bicycle: 自転車

+        graphhopper_car: 自動車(GraphHopper)

         graphhopper_foot: 歩行
         mapquest_bicycle: 自転車
         mapquest_car: 自動車
         graphhopper_foot: 歩行
         mapquest_bicycle: 自転車
         mapquest_car: 自動車

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 62d97ec371ef52af2def8e7e0588007532432824..46ccf3d54b96c008587e45449b96130ef4b325c0 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -358,7 +358,7 @@ ko:
       map_image: 지도 그림 (표준 레이어 보이기)
       embeddable_html: 내장된 HTML
       licence: 라이선스
       map_image: 지도 그림 (표준 레이어 보이기)
       embeddable_html: 내장된 HTML
       licence: 라이선스

-      export_details: OpenStreetMap 데이터는 <a href="http://opendatacommons.org/licenses/odbl/1.0/">오픈
+      export_details: OpenStreetMap 데이터는 <a href="https://opendatacommons.org/licenses/odbl/1.0/">오픈

         데이터 커먼즈 오픈 데이터베이스 라이선스</a>(ODbL)에 따라 사용할 수 있습니다.
       too_large:
         advice: '위의 내보내기가 실패하면, 아래에 나열된 원본 중 하나를 사용하는 것을 고려해주세요:'
         데이터 커먼즈 오픈 데이터베이스 라이선스</a>(ODbL)에 따라 사용할 수 있습니다.
       too_large:
         advice: '위의 내보내기가 실패하면, 아래에 나열된 원본 중 하나를 사용하는 것을 고려해주세요:'


@@ -394,14 +394,14 @@ ko:
   geocoder:
     search:
       title:
   geocoder:
     search:
       title:

-        latlon: <a href="http://openstreetmap.org/">내부</a> 결과
+        latlon: <a href="https://openstreetmap.org/">내부</a> 결과

         uk_postcode: <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>에서의
           결과
         uk_postcode: <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>에서의
           결과

-        ca_postcode: <a href="http://geocoder.ca/">Geocoder.CA</a>에서의 결과
-        osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        ca_postcode: <a href="https://geocoder.ca/">Geocoder.CA</a>에서의 결과
+        osm_nominatim: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a>에서의 결과
         geonames: <a href="http://www.geonames.org/">GeoNames</a>에서의 결과
           Nominatim</a>에서의 결과
         geonames: <a href="http://www.geonames.org/">GeoNames</a>에서의 결과

-        osm_nominatim_reverse: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim_reverse: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a>에서의 결과
         geonames_reverse: <a href="http://www.geonames.org/">GeoNames</a>에서의 결과
     search_osm_nominatim:
           Nominatim</a>에서의 결과
         geonames_reverse: <a href="http://www.geonames.org/">GeoNames</a>에서의 결과
     search_osm_nominatim:


@@ -924,7 +924,7 @@ ko:
         level10: 교외 경계
     description:
       title:
         level10: 교외 경계
     description:
       title:

-        osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a>에서의 위치
         geonames: <a href="http://www.geonames.org/">GeoNames</a>에서의 위치
       types:
           Nominatim</a>에서의 위치
         geonames: <a href="http://www.geonames.org/">GeoNames</a>에서의 위치
       types:


@@ -994,25 +994,25 @@ ko:
       title_html: 저작권 및 라이선스
       intro_1_html: |-
         OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup>은 <i>오픈 데이터</i>로 <a
       title_html: 저작권 및 라이선스
       intro_1_html: |-
         OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup>은 <i>오픈 데이터</i>로 <a

-        href="http://osmfoundation.org/">OpenStreetMap 재단</a> (OSMF)의 <a
-        href="http://opendatacommons.org/licenses/odbl/">오픈 데이터
+        href="https://osmfoundation.org/">OpenStreetMap 재단</a> (OSMF)의 <a
+        href="https://opendatacommons.org/licenses/odbl/">오픈 데이터

         커먼즈 오픈 데이터베이스 라이선스</a>(ODbL)에 따라 사용할 수 있습니다.
       intro_2_html: |-
         OpenStreetMap 기여자를 명시하는 한, OpenStreetMap 데이터를 자유롭게 복사, 배포, 전송 및 적용할 수 있습니다.
         데이터를 바꾸거나 데이터에 기초로 할 때는 오로지
         같은 라이선스에 따라서만 결과를 배포할 수 있습니다.
         커먼즈 오픈 데이터베이스 라이선스</a>(ODbL)에 따라 사용할 수 있습니다.
       intro_2_html: |-
         OpenStreetMap 기여자를 명시하는 한, OpenStreetMap 데이터를 자유롭게 복사, 배포, 전송 및 적용할 수 있습니다.
         데이터를 바꾸거나 데이터에 기초로 할 때는 오로지
         같은 라이선스에 따라서만 결과를 배포할 수 있습니다.

-        <a href="http://opendatacommons.org/licenses/odbl/1.0/">전문</a>은
+        <a href="https://opendatacommons.org/licenses/odbl/1.0/">전문</a>은

         당신의 권리와 책임을 설명합니다.
       intro_3_html: |-
         지도 타일의 지도 제작과 설명문서는
         당신의 권리와 책임을 설명합니다.
       intro_3_html: |-
         지도 타일의 지도 제작과 설명문서는

-        <a href="http://creativecommons.org/licenses/by-sa/2.0/">크리에이티브
+        <a href="https://creativecommons.org/licenses/by-sa/2.0/">크리에이티브

         커먼즈 저작자표시-동일조건변경허락 2.0</a> 라이선스(CC BY-SA)에 따라 사용할 수 있습니다.
       credit_title_html: OpenStreetMap 제작진 넣는 방법
       credit_1_html: '&ldquo;&copy; OpenStreetMap 기여자&rdquo;를 저작자로 사용해야 합니다.'
       credit_2_html: |-
         또한 명확하게 데이터는 오픈 데이터베이스 라이선스에 따라 사용할 수 있으며,
         지도 제작은 지도 타일을 사용할 때에 CC-BY-SA로 허가합니다.
         커먼즈 저작자표시-동일조건변경허락 2.0</a> 라이선스(CC BY-SA)에 따라 사용할 수 있습니다.
       credit_title_html: OpenStreetMap 제작진 넣는 방법
       credit_1_html: '&ldquo;&copy; OpenStreetMap 기여자&rdquo;를 저작자로 사용해야 합니다.'
       credit_2_html: |-
         또한 명확하게 데이터는 오픈 데이터베이스 라이선스에 따라 사용할 수 있으며,
         지도 제작은 지도 타일을 사용할 때에 CC-BY-SA로 허가합니다.

-        <a href="http://www.openstreetmap.org/copyright">이 저작권 문서</a>로
+        <a href="https://www.openstreetmap.org/copyright">이 저작권 문서</a>로

         링크하여 이렇게 할 수 있습니다.
         또한 데이터 형식으로 OSM을 배포할 때는 라이선스 이름과
         라이선스에 직접 링크를 할 수 있습니다. 링크할 수 없는
         링크하여 이렇게 할 수 있습니다.
         또한 데이터 형식으로 OSM을 배포할 때는 라이선스 이름과
         라이선스에 직접 링크를 할 수 있습니다. 링크할 수 없는


@@ -1028,7 +1028,7 @@ ko:
       more_title_html: 자세히 찾기
       more_1_html: |-
         데이터를 사용하는 방법과 제작진을 표시하는 방법에 대해서는 <a
       more_title_html: 자세히 찾기
       more_1_html: |-
         데이터를 사용하는 방법과 제작진을 표시하는 방법에 대해서는 <a

-        href="http://osmfoundation.org/Licence">OSMF 라이선스 문서
+        href="https://osmfoundation.org/Licence">OSMF 라이선스 문서

         </a>를 자세히 읽으세요.
       more_2_html: |-
         OpenStreetMap은 오픈 데이터이지만 타사 개발자를 위한
         </a>를 자세히 읽으세요.
       more_2_html: |-
         OpenStreetMap은 오픈 데이터이지만 타사 개발자를 위한


@@ -1041,10 +1041,10 @@ ko:
         우리의 기여자는 수천 명입니다. 또한 국립지도 제작 기관과
         같은 다른 소스의 공개 라이선스의 데이터를 포함하고 있습니다:
       contributors_at_html: |-
         우리의 기여자는 수천 명입니다. 또한 국립지도 제작 기관과
         같은 다른 소스의 공개 라이선스의 데이터를 포함하고 있습니다:
       contributors_at_html: |-

-        <strong>오스트리아</strong>: <a href="http://data.wien.gv.at/">Stadt Wien</a>
-        (<a href="http://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>에 따름),
-        <a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a>와
-        Land Tirol (<a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">개정된 CC-BY AT</a>에 따름)에서의
+        <strong>오스트리아</strong>: <a href="https://data.wien.gv.at/">Stadt Wien</a>
+        (<a href="https://creativecommons.org/licenses/by/3.0/at/deed.de">CC BY</a>에 따름),
+        <a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land Vorarlberg</a>와
+        Land Tirol (<a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">개정된 CC-BY AT</a>에 따름)에서의

         데이터를 포함합니다.
       contributors_ca_html: |-
         <strong>캐나다</strong>: GeoBase&reg;, GeoGratis
         데이터를 포함합니다.
       contributors_ca_html: |-
         <strong>캐나다</strong>: GeoBase&reg;, GeoGratis


@@ -1053,15 +1053,15 @@ ko:
         천연자원부)과 StatCan (캐나다 연방통계청,
         지리부)에서의 데이터를 포함합니다.
       contributors_fi_html: |-
         천연자원부)과 StatCan (캐나다 연방통계청,
         지리부)에서의 데이터를 포함합니다.
       contributors_fi_html: |-

-        <strong>핀란드</strong>: <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI 라이선스</a>에
-        따른, National Land Survey of Finland's Topographic Database와
+        <strong>핀란드</strong>: <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">NLSFI 라이선스</a>에 따른,
+        National Land Survey of Finland's Topographic Database와

         다른 데이터집합에서의 데이터를 포함합니다.
       contributors_fr_html: |-
         <strong>프랑스</strong>: Direction Générale des Impôts에서의
         데이터를 포함합니다.
       contributors_nl_html: |-
         <strong>네덜란드</strong>: &copy; AND 데이터, 2007년
         다른 데이터집합에서의 데이터를 포함합니다.
       contributors_fr_html: |-
         <strong>프랑스</strong>: Direction Générale des Impôts에서의
         데이터를 포함합니다.
       contributors_nl_html: |-
         <strong>네덜란드</strong>: &copy; AND 데이터, 2007년

-        (<a href="http://www.and.com">www.and.com</a>)을 포함합니다.
+        (<a href="https://www.and.com">www.and.com</a>)을 포함합니다.

       contributors_nz_html: |-
         <strong>뉴질랜드</strong>: Land Information New Zealand에서의
         데이터를 포함합니다. Crown이 저작권을 소유합니다.
       contributors_nz_html: |-
         <strong>뉴질랜드</strong>: Land Information New Zealand에서의
         데이터를 포함합니다. Crown이 저작권을 소유합니다.


@@ -1080,7 +1080,7 @@ ko:
       contributors_footer_1_html: |-
         자세한 내용과 OpenStreetMap을 개선하는 데 도움이 되는 데 사용한
         기타 자료에 대해서는 OpenStreetMap 위키에 있는 <a
       contributors_footer_1_html: |-
         자세한 내용과 OpenStreetMap을 개선하는 데 도움이 되는 데 사용한
         기타 자료에 대해서는 OpenStreetMap 위키에 있는 <a

-        href="http://wiki.openstreetmap.org/wiki/Contributors">기여자 문서</a>
+        href="https://wiki.openstreetmap.org/wiki/Contributors">기여자 문서</a>

         를 참조하세요.
       contributors_footer_2_html: |-
         OpenStreetMap에 포함된 데이터는 원래 데이터 제공자가
         를 참조하세요.
       contributors_footer_2_html: |-
         OpenStreetMap에 포함된 데이터는 원래 데이터 제공자가


@@ -1093,12 +1093,12 @@ ko:
         데이터를 반입하지 않도록 주의하여야 합니다.
       infringement_2_html: |-
         저작권을 가진 자료가 부적절하게 OpenStreetMap 데이터베이스나 이 사이트에
         데이터를 반입하지 않도록 주의하여야 합니다.
       infringement_2_html: |-
         저작권을 가진 자료가 부적절하게 OpenStreetMap 데이터베이스나 이 사이트에

-        추가되었다고 생각하면 <a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">게시
+        추가되었다고 생각하면 <a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">게시

         중단 절차</a>를 참고하거나 <a href="http://dmca.openstreetmap.org/">온라인
         신고 페이지</a>에서 직접 제출하세요.
       trademarks_title_html: <span id="trademarks"></span>등록 상표
       trademarks_1_html: OpenStreetMap, 돋보기 로고, 스테이트 오브 맵은 OpenStreetMap 재단의 등록상표입니다.
         중단 절차</a>를 참고하거나 <a href="http://dmca.openstreetmap.org/">온라인
         신고 페이지</a>에서 직접 제출하세요.
       trademarks_title_html: <span id="trademarks"></span>등록 상표
       trademarks_1_html: OpenStreetMap, 돋보기 로고, 스테이트 오브 맵은 OpenStreetMap 재단의 등록상표입니다.

-        상표의 사용에 대해 의문이 있는 경우, 관련된 질문을 <a href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">라이선싱
+        상표의 사용에 대해 의문이 있는 경우, 관련된 질문을 <a href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">라이선싱

         작업 그룹</a>으로 보내 주세요.
   welcome_page:
     title: 환영합니다!
         작업 그룹</a>으로 보내 주세요.
   welcome_page:
     title: 환영합니다!


@@ -1127,8 +1127,8 @@ ko:
     rules:
       title: 여기서 규칙!
       paragraph_1_html: "OpenStreetMap은 몇 가지 형식적인 규칙이 있지만 우리는 모든 참가자가 협력하고, 공동체와 소통하기를
     rules:
       title: 여기서 규칙!
       paragraph_1_html: "OpenStreetMap은 몇 가지 형식적인 규칙이 있지만 우리는 모든 참가자가 협력하고, 공동체와 소통하기를

-        바랍니다.\n여러분이 직접 편집하지 않는 다른 활동을 고려한다면, \n<a href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'>가져오기</a>와
-        \n<a href='http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>자동화된
+        바랍니다.\n여러분이 직접 편집하지 않는 다른 활동을 고려한다면, \n<a href='https://wiki.openstreetmap.org/wiki/Import/Guidelines'>가져오기</a>와
+        \n<a href='https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>자동화된

         편집</a>에서의\n다음 가이드라인을 읽고 따라주시기 바랍니다."
     questions:
       title: 질문 있나요?
         편집</a>에서의\n다음 가이드라인을 읽고 따라주시기 바랍니다."
     questions:
       title: 질문 있나요?


@@ -1165,7 +1165,7 @@ ko:
       explanation_html: |-
         우리의 데이터가 사용되는 방법이나 내용에 대한 문제가 있다면 더 많은 법률
         정보에 대한 우리의 <a href='/copyright'>저작권 문서</a>를 참조하거나 해당
       explanation_html: |-
         우리의 데이터가 사용되는 방법이나 내용에 대한 문제가 있다면 더 많은 법률
         정보에 대한 우리의 <a href='/copyright'>저작권 문서</a>를 참조하거나 해당

-        <a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF 작업 그룹</a>에 문의하시기 바랍니다.
+        <a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF 작업 그룹</a>에 문의하시기 바랍니다.

   help_page:
     title: 도움말 얻기
     introduction: |-
   help_page:
     title: 도움말 얻기
     introduction: |-


@@ -1176,7 +1176,7 @@ ko:
       title: OSM에 오신 것을 환영합니다
       description: OpenStreetMap 기초를 다루는 이 퀵 가이드로 시작합니다.
     beginners_guide:
       title: OSM에 오신 것을 환영합니다
       description: OpenStreetMap 기초를 다루는 이 퀵 가이드로 시작합니다.
     beginners_guide:

-      url: http://wiki.openstreetmap.org/wiki/Ko:%EC%B4%88%EB%B3%B4%EC%9E%90_%EC%95%88%EB%82%B4%EC%84%9C
+      url: https://wiki.openstreetmap.org/wiki/Ko:%EC%B4%88%EB%B3%B4%EC%9E%90_%EC%95%88%EB%82%B4%EC%84%9C

       title: 초보자 가이드
       description: 커뮤니티에서 유지하는 초보자 가이드
     help:
       title: 초보자 가이드
       description: 커뮤니티에서 유지하는 초보자 가이드
     help:


@@ -1196,7 +1196,7 @@ ko:
       title: switch2osm
       description: 회사나 단체가 OpenStreetMap와 다른 서비스를 기반으로 전환하는 것에 도움을 주십시오.
     wiki:
       title: switch2osm
       description: 회사나 단체가 OpenStreetMap와 다른 서비스를 기반으로 전환하는 것에 도움을 주십시오.
     wiki:

-      url: http://wiki.openstreetmap.org/
+      url: https://wiki.openstreetmap.org/

       title: wiki.openstreetmap.org
       description: 깊이 있는 OSM 설명문서에 대해서는 위키를 찾아보세요.
   about_page:
       title: wiki.openstreetmap.org
       description: 깊이 있는 OSM 설명문서에 대해서는 위키를 찾아보세요.
   about_page:


@@ -1211,17 +1211,17 @@ ko:
     community_driven_title: 공동체 주도
     community_driven_html: |-
       OpenStreetMap의 공동체는 다양하고, 열정적이며, 날마다 자라납니다. 열성적인 지도 제작자, GIS 전문가, OSM 서버를 작동시키는 기술자, 재해 지역의 지도를 제작하는 인도주의자 등이 우리의 기여자입니다.
     community_driven_title: 공동체 주도
     community_driven_html: |-
       OpenStreetMap의 공동체는 다양하고, 열정적이며, 날마다 자라납니다. 열성적인 지도 제작자, GIS 전문가, OSM 서버를 작동시키는 기술자, 재해 지역의 지도를 제작하는 인도주의자 등이 우리의 기여자입니다.

-      공동체에 대해 알고 싶다면 <a href='%{diary_path}'>사용자 일기</a>, <a href='https://blog.openstreetmap.org'>OpenStreetMap 블로그</a>, <a href='http://blogs.openstreetmap.org/'>공동체 블로그</a>, <a href='http://www.osmfoundation.org/'>OSM 재단</a> 웹사이트를 방문해보세요.
+      공동체에 대해 알고 싶다면 <a href='%{diary_path}'>사용자 일기</a>, <a href='https://blog.openstreetmap.org'>OpenStreetMap 블로그</a>, <a href='https://blogs.openstreetmap.org/'>공동체 블로그</a>, <a href='https://www.osmfoundation.org/'>OSM 재단</a> 웹사이트를 방문해보세요.

     open_data_title: 개방형 자료
     open_data_html: 'OpenStreetMap은 개방형 자료입니다: OpenStreetMap 및 기여자를 저작자로 명시하는 한 어떠한
       목적으로도 자유롭게 이용할 수 있습니다. 만일 어떤 방법으로 자료를 변경하거나 2차 제작을 한다면, 동일한 라이선스에 한하여 그 결과물을
       배포할 수 있습니다. 자세한 내용은 <a href=''%{copyright_path}''>저작권 및 라이선스 문서</a>에서 확인하세요.'
     legal_title: 법률
     legal_html: |-
     open_data_title: 개방형 자료
     open_data_html: 'OpenStreetMap은 개방형 자료입니다: OpenStreetMap 및 기여자를 저작자로 명시하는 한 어떠한
       목적으로도 자유롭게 이용할 수 있습니다. 만일 어떤 방법으로 자료를 변경하거나 2차 제작을 한다면, 동일한 라이선스에 한하여 그 결과물을
       배포할 수 있습니다. 자세한 내용은 <a href=''%{copyright_path}''>저작권 및 라이선스 문서</a>에서 확인하세요.'
     legal_title: 법률
     legal_html: |-

-      이 사이트 및 많은 다른 관련된 부문은 공동체를 대표하여 <a href='http://osmfoundation.org/'>OpenStreetMap 재단</a>에서 정식적으로 운영합니다. OpenStreetMap 재단이 운영하는 부문의 이용은 <a href="http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
-      허용할 수 있는 이용 정책</a> 및 <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy">개인정보 정책</a> 조건 하에서 이루어집니다.
+      이 사이트 및 많은 다른 관련된 부문은 공동체를 대표하여 <a href='https://osmfoundation.org/'>OpenStreetMap 재단</a>에서 정식적으로 운영합니다. OpenStreetMap 재단이 운영하는 부문의 이용은 <a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
+      허용할 수 있는 이용 정책</a> 및 <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">개인정보 정책</a> 조건 하에서 이루어집니다.

       <br>
       <br>

-      만일 이용허락 또는 저작권 및 다른 법률적인 질문이나 사안이 있다면, <a href='http://osmfoundation.org/Contact'>OpenStreetMap 재단에 연락</a>하십시오.
+      만일 이용허락 또는 저작권 및 다른 법률적인 질문이나 사안이 있다면, <a href='https://osmfoundation.org/Contact'>OpenStreetMap 재단에 연락</a>하십시오.

     partners_title: 파트너
   notifier:
     diary_comment_notification:
     partners_title: 파트너
   notifier:
     diary_comment_notification:


@@ -1410,7 +1410,7 @@ ko:
         가지 다른 설정</a> 또한 OpenStreetMap 편집을 위해 사용할 수 있습니다.
       potlatch_unsaved_changes: 바뀐 내용을 저장하지 않았습니다. (Potlatch에 저장하려면 라이브 모드에서 편집하는
         경우 현재 길이나 점의 선택을 해제하시고, 저장 버튼이 있다면 저장을 클릭해야 합니다.)
         가지 다른 설정</a> 또한 OpenStreetMap 편집을 위해 사용할 수 있습니다.
       potlatch_unsaved_changes: 바뀐 내용을 저장하지 않았습니다. (Potlatch에 저장하려면 라이브 모드에서 편집하는
         경우 현재 길이나 점의 선택을 해제하시고, 저장 버튼이 있다면 저장을 클릭해야 합니다.)

-      potlatch2_not_configured: Potlatch 2가 설정되지 않았습니다 - 자세한 정보는 http://wiki.openstreetmap.org/wiki/The_Rails_Port
+      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을 지원하지 않습니다.
       potlatch2_unsaved_changes: 바뀐 내용을 저장하지 않았습니다. (Potlatch 2에서 저장하려면 저장을 클릭해야 합니다.)
       id_not_configured: iD가 설정되지 않았습니다
       no_iframe_support: 브라우저가 이 기능에 필요한 HTML iframe을 지원하지 않습니다.


@@ -1500,7 +1500,7 @@ ko:
       edit: 편집
       preview: 미리 보기
     markdown_help:
       edit: 편집
       preview: 미리 보기
     markdown_help:

-      title_html: <a href="http://daringfireball.net/projects/markdown/">마크다운</a>으로
+      title_html: <a href="https://daringfireball.net/projects/markdown/">마크다운</a>으로

         구문 분석됩니다
       headings: 문단 제목
       heading: 문단 제목
         구문 분석됩니다
       headings: 문단 제목
       heading: 문단 제목


@@ -1605,7 +1605,7 @@ ko:
       description: 최근의 GPS 궤적 올리기 둘러보기
       tagged_with: '%{tags}(으)로 태그함'
       empty_html: 여기에는 아직 아무것도 없습니다. <a href='%{upload_link}'>새 궤적 올리기</a>를 사용하거나
       description: 최근의 GPS 궤적 올리기 둘러보기
       tagged_with: '%{tags}(으)로 태그함'
       empty_html: 여기에는 아직 아무것도 없습니다. <a href='%{upload_link}'>새 궤적 올리기</a>를 사용하거나

-        <a href='http://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>위키 문서</a>에서
+        <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>위키 문서</a>에서

         GPS 궤적에 대해 더 알아보세요.
     delete:
       scheduled_for_deletion: 삭제 계획중인 궤적
         GPS 궤적에 대해 더 알아보세요.
     delete:
       scheduled_for_deletion: 삭제 계획중인 궤적


@@ -1802,11 +1802,11 @@ ko:
           <p>다른 지도와는 달리, OpenStreetMap은 완전히 여러분과 같은 사람들이 만들어,
           누구나 자유롭게 고치고, 갱신하며, 내려받아 사용할 수 있습니다.</p>
           <p>기여를 시작하려면 가입하세요. 계정 확인용 이메일을 보내드립니다.</p>
           <p>다른 지도와는 달리, OpenStreetMap은 완전히 여러분과 같은 사람들이 만들어,
           누구나 자유롭게 고치고, 갱신하며, 내려받아 사용할 수 있습니다.</p>
           <p>기여를 시작하려면 가입하세요. 계정 확인용 이메일을 보내드립니다.</p>

-      license_agreement: 계정을 확인하면 당신은 <a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">기여자
+      license_agreement: 계정을 확인하면 당신은 <a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">기여자

         약관</a>에 동의해야합니다.
       email address: '이메일 주소:'
       confirm email address: '이메일 주소 확인:'
         약관</a>에 동의해야합니다.
       email address: '이메일 주소:'
       confirm email address: '이메일 주소 확인:'

-      not displayed publicly: 당신의 주소는 공개되지 않습니다. 자세한 내용은 <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy"
+      not displayed publicly: 당신의 주소는 공개되지 않습니다. 자세한 내용은 <a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy"

         title="OSMF privacy policy including section on email addresses">개인정보 정책</a>을
         참조하시기 바랍니다.
       display name: '표시 이름:'
         title="OSMF privacy policy including section on email addresses">개인정보 정책</a>을
         참조하시기 바랍니다.
       display name: '표시 이름:'


@@ -1820,6 +1820,7 @@ ko:
       terms accepted: 새 기여자 약관에 동의해 주셔서 감사합니다!
       terms declined: 새 기여자 약관에 동의하지 않은 것으로 결정했기에 죄송합니다. 자세한 정보에 대해서는 <a href="%{url}">이
         위키 문서</a>를 참조하세요.
       terms accepted: 새 기여자 약관에 동의해 주셔서 감사합니다!
       terms declined: 새 기여자 약관에 동의하지 않은 것으로 결정했기에 죄송합니다. 자세한 정보에 대해서는 <a href="%{url}">이
         위키 문서</a>를 참조하세요.

+      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: 기여자 약관
       heading: 기여자 약관
     terms:
       title: 기여자 약관
       heading: 기여자 약관


@@ -1918,7 +1919,7 @@ ko:
       email never displayed publicly: (절대 공개하지 않습니다)
       external auth: '바깥 인증:'
       openid:
       email never displayed publicly: (절대 공개하지 않습니다)
       external auth: '바깥 인증:'
       openid:

-        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link: https://wiki.openstreetmap.org/wiki/OpenID

         link text: 이게 뭐죠?
       public editing:
         heading: '공개 편집:'
         link text: 이게 뭐죠?
       public editing:
         heading: '공개 편집:'


@@ -1931,7 +1932,7 @@ ko:
         heading: 공개 편집
         text: 현재 편집은 익명으로 나타나며, 다른 사람에게서 메시지를 받을 수 없고 자신의 위치가 공개되지 않습니다. 자신이 편집한 것을
           드러내고 다른 사람이 웹 사이트를 통해 연락할 수 있게 하려면 아래 버튼을 클릭하세요. <b>0.6 API 개편 이후 공개 사용자만
         heading: 공개 편집
         text: 현재 편집은 익명으로 나타나며, 다른 사람에게서 메시지를 받을 수 없고 자신의 위치가 공개되지 않습니다. 자신이 편집한 것을
           드러내고 다른 사람이 웹 사이트를 통해 연락할 수 있게 하려면 아래 버튼을 클릭하세요. <b>0.6 API 개편 이후 공개 사용자만

-          지도 데이터를 편집할 수 있습니다</b>. (<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">이유
+          지도 데이터를 편집할 수 있습니다</b>. (<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">이유

           알아보기</a>).<ul><li>공개 사용자가 되더라도 이메일 주소는 공개되지 않습니다.</li><li>이 동작은 취소할 수 없으며,
           모든 새로운 사용자는 현재 기본적으로 공개 계정입니다.</li></ul>
       contributor terms:
           알아보기</a>).<ul><li>공개 사용자가 되더라도 이메일 주소는 공개되지 않습니다.</li><li>이 동작은 취소할 수 없으며,
           모든 새로운 사용자는 현재 기본적으로 공개 계정입니다.</li></ul>
       contributor terms:


@@ -1940,6 +1941,7 @@ ko:
         not yet agreed: 아직 새 기여자 약관에 동의하지 않았습니다.
         review link text: 검토할 사용자의 편의에 이 링크를 따르고 새 기여자 약관에 동의하세요.
         agreed_with_pd: 또한 자신의 편집이 퍼블릭 도메인에 있어야 한다고 생각하는 것도 선언하고 있습니다.
         not yet agreed: 아직 새 기여자 약관에 동의하지 않았습니다.
         review link text: 검토할 사용자의 편의에 이 링크를 따르고 새 기여자 약관에 동의하세요.
         agreed_with_pd: 또한 자신의 편집이 퍼블릭 도메인에 있어야 한다고 생각하는 것도 선언하고 있습니다.

+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms

         link text: 이게 뭐죠?
       profile description: '프로필 설명:'
       preferred languages: 주로 사용하는 언어
         link text: 이게 뭐죠?
       profile description: '프로필 설명:'
       preferred languages: 주로 사용하는 언어

diff --git a/config/locales/lb.yml b/config/locales/lb.yml
index 458ed77781446a3a248993f853392d43f15908bb..9458c758f70054842d3e67bf2e7b5e91b0aec0ee 100644 (file)
--- a/config/locales/lb.yml
+++ b/config/locales/lb.yml
@@ -265,10 +265,10 @@ lb:
   geocoder:
     search:
       title:
   geocoder:
     search:
       title:

-        latlon: Resultater vun <a href="http://openstreetmap.org/">Internal</a>
+        latlon: Resultater vun <a href="https://openstreetmap.org/">Internal</a>

         uk_postcode: Resultater vun <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
           Postcode</a>
         uk_postcode: Resultater vun <a href="http://www.npemap.org.uk/">NPEMap / FreeThe
           Postcode</a>

-        ca_postcode: Resultater vu <a href="http://geocoder.ca/">Geocoder.ca</a>
+        ca_postcode: Resultater vu <a href="https://geocoder.ca/">Geocoder.ca</a>

         geonames: Resultater vu <a href="http://www.geonames.org/">GeoNames</a>
         geonames_reverse: Resultater vun <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
         geonames: Resultater vu <a href="http://www.geonames.org/">GeoNames</a>
         geonames_reverse: Resultater vun <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:


@@ -667,7 +667,7 @@ lb:
       url: /welcome
       title: Wëllkomm bäi OSM
     beginners_guide:
       url: /welcome
       title: Wëllkomm bäi OSM
     beginners_guide:

-      url: http://wiki.openstreetmap.org/wiki/Beginners%27_guide
+      url: https://wiki.openstreetmap.org/wiki/Beginners%27_guide

       title: Guide fir nei Benotzer
     help:
       url: https://help.openstreetmap.org/
       title: Guide fir nei Benotzer
     help:
       url: https://help.openstreetmap.org/


@@ -681,7 +681,7 @@ lb:
     irc:
       title: IRC
     wiki:
     irc:
       title: IRC
     wiki:

-      url: http://wiki.openstreetmap.org/
+      url: https://wiki.openstreetmap.org/

       title: wiki.openstreetmap.org
   about_page:
     next: Weider
       title: wiki.openstreetmap.org
   about_page:
     next: Weider


@@ -998,7 +998,7 @@ lb:
       email address: 'E-Mail-Adress:'
       confirm email address: 'E-Mail-Adress confirméieren:'
       not displayed publicly: Är Adress gëtt net ëffentlech gewisen, kuckt eis <a
       email address: 'E-Mail-Adress:'
       confirm email address: 'E-Mail-Adress confirméieren:'
       not displayed publicly: Är Adress gëtt net ëffentlech gewisen, kuckt eis <a

-        href="http://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy
+        href="https://wiki.osmfoundation.org/wiki/Privacy_Policy" title="OSMF privacy

         policy including section on email addresses">Dateschutzrichtlinn</a> fir méi
         Informatiounen
       display name: Numm weisen
         policy including section on email addresses">Dateschutzrichtlinn</a> fir méi
         Informatiounen
       display name: Numm weisen


@@ -1071,7 +1071,7 @@ lb:
       new email address: 'Nei E-Mail-Adress:'
       email never displayed publicly: (ni ëffentlech gewisen)
       openid:
       new email address: 'Nei E-Mail-Adress:'
       email never displayed publicly: (ni ëffentlech gewisen)
       openid:

-        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link: https://wiki.openstreetmap.org/wiki/OpenID

         link text: wat ass dat?
       public editing:
         enabled link text: wat ass dëst?
         link text: wat ass dat?
       public editing:
         enabled link text: wat ass dëst?

diff --git a/config/locales/th.yml b/config/locales/th.yml
index b929eca982b4050a637dc37c7614abd69ee1e9c7..f9325c7af342bb66cfb26d5d98604a86094b7a2f 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1029,27 +1029,30 @@ th:
     whats_on_the_map:
       title: บนแผนที่ควรมีอะไร
       on_html: OpenStreetMap เป็นที่ที่คุณบันทึกสิ่งที่<em>มีอยู่จริงบนพื้นโลก</em>
     whats_on_the_map:
       title: บนแผนที่ควรมีอะไร
       on_html: OpenStreetMap เป็นที่ที่คุณบันทึกสิ่งที่<em>มีอยู่จริงบนพื้นโลก</em>

-        à¹\81ละ<em>มีอยูà¹\88à¹\83à¸\99à¸\9bัà¸\88à¸\88ุà¸\9aัà¸\99</em> - à¸\8bึà¹\88à¸\87รวมà¸\97ัà¹\89à¸\87à¸\95ึà¸\81 à¸\96à¸\99à¸\99 ที่คุณแห็นอยู่ดาษดื่นทั่วไป
-        à¹\81ละรายละเอียดเกี่ยวกับร้านรวงต่างๆ หรือข้อมูลอื่นๆ ที่เห็นได้ของสถานที่เหล่านั้น,
+        à¹\81ละ<em>มีอยูà¹\88à¹\83à¸\99à¸\9bัà¸\88à¸\88ุà¸\9aัà¸\99</em> - à¹\80à¸\8aà¹\88à¸\99à¸\95ึà¸\81 หรือà¸\96à¸\99à¸\99ที่คุณแห็นอยู่ดาษดื่นทั่วไป
+        รวมà¸\97ัà¹\89à¸\87รายละเอียดเกี่ยวกับร้านรวงต่างๆ หรือข้อมูลอื่นๆ ที่เห็นได้ของสถานที่เหล่านั้น,

         โดยคุณจะทำแผนที่โครงสร้างอะไรที่คุณเห็นอยู่บนพื้นดินก็ได้ แล้วแต่ความสนใจของคุณเอง
       off_html: แต่ที่นี่จะ<em>ไม่รับ</em>ข้อมูลที่มาจากข้อคิดเห็น เช่นคะแนนเรตติ้ง
         สถานที่ที่เคยมีอยู่แต่ในอดีต (ปัจจุบันไม่มีแล้ว) รวมทั้งสถานที่ที่คาดว่าจะมีในอนาคต,
         และจะไม่รับข้อมูลจากแหล่งที่มีลิขสิทธิ์อื่นๆ, ฉะนั้นอย่าได้คัดลอกข้อมูลจากแผนที่ออนไลน์หรือแผนที่กระดาษมาใส่
         (เว้นแต่คุณได้รับอนุญาตจากเจ้าของลิขสิทธิ์แล้ว)
     basic_terms:
         โดยคุณจะทำแผนที่โครงสร้างอะไรที่คุณเห็นอยู่บนพื้นดินก็ได้ แล้วแต่ความสนใจของคุณเอง
       off_html: แต่ที่นี่จะ<em>ไม่รับ</em>ข้อมูลที่มาจากข้อคิดเห็น เช่นคะแนนเรตติ้ง
         สถานที่ที่เคยมีอยู่แต่ในอดีต (ปัจจุบันไม่มีแล้ว) รวมทั้งสถานที่ที่คาดว่าจะมีในอนาคต,
         และจะไม่รับข้อมูลจากแหล่งที่มีลิขสิทธิ์อื่นๆ, ฉะนั้นอย่าได้คัดลอกข้อมูลจากแผนที่ออนไลน์หรือแผนที่กระดาษมาใส่
         (เว้นแต่คุณได้รับอนุญาตจากเจ้าของลิขสิทธิ์แล้ว)
     basic_terms:

-      title: เงื่อนไขพื้นฐานสำหรับการทำแผนที่
+      title: คำศัพท์พื้นฐานในการทำแผนที่
+      paragraph_1_html: 'เมื่อคุณเข้ามาทำแผนที่ใน OpenStreetMap, คุณจะพบกับศัพท์เฉพาะหลายคำ
+        ซึ่งความหมายจะอธิบายไว้เบื้องต้นที่ด้านล่างนี้:'
+      editor_html: <strong>ตัวแก้ไข</strong> หมายถึงโปรแกรม หรือเว็บไซต์ ที่คุณใช้แก้ไขข้อมูลแผนที่

       node_html: <strong>หมุด</strong> จะเป็นจุดหนึ่งจุดบนแผนที่, เช่น ร้านอาหารที่ตั้งเดี่ยวๆ
         หรือต้นไม้
       node_html: <strong>หมุด</strong> จะเป็นจุดหนึ่งจุดบนแผนที่, เช่น ร้านอาหารที่ตั้งเดี่ยวๆ
         หรือต้นไม้

-      way_html: <strong>à¹\80สà¹\89à¸\99à¸\97าà¸\87</strong> à¹\80à¸\9bà¹\87à¸\99สà¹\88วà¸\99à¸\97ีà¹\88à¹\80à¸\9bà¹\87à¸\99à¹\80สà¹\89à¸\99 à¹\80à¸\8aà¹\88à¸\99à¸\96à¸\99à¸\99, ลำà¸\98าร หรือà¹\84มà¹\88à¸\81à¹\87à¹\80à¸\9bà¹\87à¸\99รูà¸\9bà¸\9bิà¸\94
-        à¹\80à¸\8aà¹\88à¸\99à¸\97ะà¹\80ลสาà¸\9a, หรือตึก
+      way_html: <strong>à¹\80สà¹\89à¸\99à¸\97าà¸\87</strong> à¹\80à¸\9bà¹\87à¸\99สà¹\88วà¸\99à¸\97ีà¹\88ลัà¸\81ษà¸\93ะà¹\80à¸\9bà¹\87à¸\99à¹\80สà¹\89à¸\99à¸\9aà¸\99à¹\81à¸\9cà¸\99à¸\97ีà¹\88 à¹\80à¸\8aà¹\88à¸\99à¸\96à¸\99à¸\99
+        ลำà¸\98าร, หรือà¹\84มà¹\88à¸\81à¹\87à¹\80à¸\9bà¹\87à¸\99รูà¸\9bà¸\9bิà¸\94 à¹\80à¸\8aà¹\88à¸\99à¸\97ะà¹\80ลสาà¸\9a หรือตึก

       tag_html: <strong>ป้ายกำกับ</strong> เป็นข้อมูลรายละเอียดของหมุด หรือเส้นทาง,
         เช่น ชื่อ (ของร้าน) หรือ ขีดจำกัดความเร็ว (ของถนน)
     rules:
       title: อย่าลืมกติกา!
     questions:
       title: มีคำถามอีกหรือไม่?
       tag_html: <strong>ป้ายกำกับ</strong> เป็นข้อมูลรายละเอียดของหมุด หรือเส้นทาง,
         เช่น ชื่อ (ของร้าน) หรือ ขีดจำกัดความเร็ว (ของถนน)
     rules:
       title: อย่าลืมกติกา!
     questions:
       title: มีคำถามอีกหรือไม่?

-      paragraph_1_html: "OpenStreetMap มีสื่อสำหรับค้นคว้า สอบถาม ตอบคำถาม \nสนทนา
-        à¸\95ลอà¸\94à¸\88à¸\99à¸\88ัà¸\94à¸\97ำวิà¸\98ีà¸\81ารสรà¹\89าà¸\87à¹\81à¸\9cà¸\99à¸\97ีà¹\88\n<a href='%{help_url}'>à¸\82อรัà¸\9aà¸\84วามà¸\8aà¹\88วยà¹\80หลือที่นี่</a>"
+      paragraph_1_html: "OpenStreetMap มีสื่อสำหรับค้นคว้า สอบถาม ตอบคำถาม \nสนทนาหัวข้อต่างๆ
+        à¸\95ลอà¸\94à¸\88à¸\99อภิà¸\9bรายà¹\81ละà¸\88ัà¸\94à¸\97ำวิà¸\98ีà¸\81ารสรà¹\89าà¸\87à¹\81à¸\9cà¸\99à¸\97ีà¹\88\nà¸\8bึà¹\88à¸\87à¸\84ุà¸\93à¸\88ะ<a href='%{help_url}'>หาà¸\84วามà¸\8aà¹\88วยà¹\80หลือà¹\84à¸\94à¹\89ที่นี่</a>"

     start_mapping: เริ่มการทำแผนที่
     add_a_note:
       title: ไม่มีเวลาแก้ไขใช่ไหม? ใส่หมายเหตุไว้แทนได้!
     start_mapping: เริ่มการทำแผนที่
     add_a_note:
       title: ไม่มีเวลาแก้ไขใช่ไหม? ใส่หมายเหตุไว้แทนได้!


@@ -1422,12 +1425,86 @@ th:
       upload_trace: อัปโหลดรอยทาง
       see_all_traces: แสดงรอยทางทั้งหมด
       see_your_traces: แสดงรอยทางของท่าน
       upload_trace: อัปโหลดรอยทาง
       see_all_traces: แสดงรอยทางทั้งหมด
       see_your_traces: แสดงรอยทางของท่าน

+    trace_optionals:
+      tags: ป้ายกำกับ

     view:
     view:

+      title: แสดงรอยทางชื่อ %{name}
+      heading: แสดงรอยทางชื่อ %{name}
+      pending: ค้างอยู่
+      filename: 'ชื่อไฟล์:'
+      download: ดาวน์โหลด
+      uploaded: 'อัปโหลดเมื่อ:'
+      points: 'จุด:'

       start_coordinates: 'เริ่มจากตำแหน่ง:'
       start_coordinates: 'เริ่มจากตำแหน่ง:'

+      map: แผนที่
+      edit: แก้ไข
+      owner: 'เจ้าของ:'
+      description: 'คำอธิบาย:'
+      tags: 'ป้ายกำกับ:'
+      none: ไม่มี
+      edit_track: แก้ไขรอยทางนี้
+      delete_track: ลบรอยทางนี้
+      trace_not_found: ไม่พบรอยทางนี้!
+      visibility: 'สถานะการแสดง:'
+    trace_paging_nav:
+      showing_page: หน้า %{page}
+      older: รอยทางที่เก่ากว่า
+      newer: รอยทางที่ใหม่กว่า
+    trace:
+      pending: ค้างอยู่
+      count_points: '%{count} จุด'
+      ago: '%{time_in_words_ago} มาแล้ว'
+      more: เพิ่มเติม
+      trace_details: ดูรายละเอียดรอยทาง
+      view_map: แสดงแผนที่
+      edit: แก้ไข
+      edit_map: แก้ไขแผนที่
+      public: สาธารณะ
+      identifiable: ระบุได้
+      private: ส่วนตัว
+      trackable: ติดตามได้
+      by: โดย
+      in: ใน
+      map: แผนที่

     list:
       public_traces: รอยทาง GPS สาธารณะ
       your_traces: รอยทาง GPS ของท่าน
     list:
       public_traces: รอยทาง GPS สาธารณะ
       your_traces: รอยทาง GPS ของท่าน

+      public_traces_from: รอยทางจีพีเอสสาธารณะโดยผู้ใช้ %{user}
+      description: ค้นหาการอัปโหลดรอยทางจีพีเอสล่าสุด
+      tagged_with: ระบุด้วยป้าย %{tags}

   oauth_clients:
   oauth_clients:

+    new:
+      submit: ลงทะเบียน
+    edit:
+      title: แก้ไขการสมัครของท่าน
+      submit: แก้ไข
+    show:
+      title: รายละเอียด OAuth ของ %{app_name}
+      key: 'คีย์ผู้บริโภค:'
+      secret: 'ความลับผู้บริโภค:'
+      url: 'ขอตัวระบุยูอาร์แอล:'
+      access_url: 'เข้าถึงตัวระบุยูอาร์แอล:'
+      authorize_url: 'อนุญาตยูอาร์แอล:'
+      support_notice: เรารองรับลายเซ็นชนิด HMAC-SHA1 (แนะนำให้ใช้) และ RSA-SHA1
+      edit: แก้ไขรายละเอียด
+      delete: ลบไคลเอนต์
+      confirm: ท่านแน่ใจหรือไม่?
+      requests: 'ขอรับการอนุญาตต่อไปนี้จากผู้ใช้:'
+      allow_read_prefs: อ่านการตั้งค่าผู้ใช้
+      allow_write_prefs: แก้ไขการตั้งค่าผู้ใช้
+      allow_write_diary: สร้างรายการบันทึก ข้อคิดเห็น และพบเพื่อนใหม่
+      allow_write_api: แก้ไขแผนที่
+      allow_read_gpx: อ่านรอยทาง GPS ส่วนบุคคล
+      allow_write_gpx: อัปโหลดรอยทาง GPS
+      allow_write_notes: แก้ไขหมายเหตุ
+    index:
+      title: รายละเอียด OAuth ของฉัน
+      my_tokens: การสมัครของฉันที่ได้รับอนุญาตแล้ว
+      list_tokens: 'รายละเอียดต่อไปนี้ออกให้แก่แอปพลิเคชันในนามของท่าน:'
+      application: ชื่อแอปพลิเคชัน
+      issued_at: ออกให้ที่
+      revoke: เพิกถอน
+      my_apps: แอปพลิเคชันผู้ใช้ของฉัน

     form:
       required: จำเป็น
   user:
     form:
       required: จำเป็น
   user:


@@ -1488,8 +1565,46 @@ th:
     no_such_user:
       title: ไม่มีผู้ใช้ที่ระบุ
       heading: ไม่พบผู้ใช้ชื่อ %{user}
     no_such_user:
       title: ไม่มีผู้ใช้ที่ระบุ
       heading: ไม่พบผู้ใช้ชื่อ %{user}

+      deleted: ลบแล้ว

     view:
     view:

+      my diary: บันทึกของฉัน
+      new diary entry: สร้างบันทึกใหม่
+      my edits: การแก้ไขของฉัน
+      my traces: รอยทางของฉัน
+      my notes: หมายเหตุของฉัน
+      my messages: ข้อความของฉัน
+      my profile: ประวัติของฉัน
+      my settings: การตั้งค่าของฉัน
+      my comments: ความคิดเห็นของฉัน
+      oauth settings: การตั้งค่าoauth
+      blocks on me: ผู้ใช้ที่กีดกันข้าพเจ้า
+      blocks by me: ผู้ใช้ที่ข้าพเจ้ากีดกัน
+      send message: ส่งข้อความ
+      diary: บันทึก
+      edits: การแก้ไข
+      traces: รอยทาง
+      notes: หมายเหตุแผนที่
+      remove as friend: ลบจากรายการเพื่อน
+      add as friend: เพิ่มเข้ารายการเพื่อน
+      mapper since: 'ทำแผนที่นี้ตั้งแต่:'
+      ago: (%{time_in_words_ago} มาแล้ว)
+      ct status: 'เงื่อนไขผู้ร่วมสร้างสรรค์:'
+      ct undecided: ยังไม่ตัดสินใจ
+      ct declined: ไม่ยอมรับ
+      ct accepted: ยอมรับแล้วเมื่อ %{ago} ก่อน
+      latest edit: 'แก้ไขล่าสุดเมื่อ %{ago}:'
+      email address: 'ที่อยู่อีเมล:'
+      created from: 'สร้างจาก:'

       status: 'สถานะ:'
       status: 'สถานะ:'

+      spam score: 'คะแนนสแปม:'
+      description: คำอธิบาย
+      user location: ตำแหน่งผู้ใช้
+      settings_link_text: การตั้งค่า
+      your friends: เพื่อนของท่าน
+      no friends: ท่านยังไม่ได้เพิ่มเพื่อนใด ๆ
+      km away: ห่างออกไป %{count}km
+      m away: ห่างออกไป %{count}m
+      nearby users: ผู้ใช้ท่านอื่นที่ใกล้เคียง

       comments: ความเห็นที่เขียน
       create_block: กีดกันผู้ใช้นี้
       activate_user: เปิดใช้งานผู้ใช้นี้
       comments: ความเห็นที่เขียน
       create_block: กีดกันผู้ใช้นี้
       activate_user: เปิดใช้งานผู้ใช้นี้


@@ -1613,17 +1728,72 @@ th:
       are_you_sure: ท่านแน่ใจว่าต้องการถอดถอนสถานะ `%{role}' จากผู้ใช้ `%{name}' หรือไม่?
       confirm: ยืนยัน
       fail: ไม่สามารถถอดถอนสถานะ `%{role}' แก่ผู้ใช้ `%{name}' โปรดตรวจสอบว่าทั้งผู้ใช้และสถานะเป็นที่ถูกต้องดีแล้ว
       are_you_sure: ท่านแน่ใจว่าต้องการถอดถอนสถานะ `%{role}' จากผู้ใช้ `%{name}' หรือไม่?
       confirm: ยืนยัน
       fail: ไม่สามารถถอดถอนสถานะ `%{role}' แก่ผู้ใช้ `%{name}' โปรดตรวจสอบว่าทั้งผู้ใช้และสถานะเป็นที่ถูกต้องดีแล้ว

+  user_block:
+    model:
+      non_moderator_revoke: ต้องเป็นผู้ดูแลระบบจึงจะสามารถเพิกถอนการกีดกันได้
+    not_found:
+      sorry: ขออภัย การกีดกันผู้ใช้รหัส %{id} ไม่พบ
+      back: กลับไปที่ดัชนี
+    new:
+      title: สร้างการกีดกันบน %{name}
+      heading: สร้างการกีดกันบน %{name}
+      reason: เหตุผลที่ผู้ใช้ %{name} ถูกกีดกัน โปรดอย่าใช้อารมณ์รุนแรงในระหว่างระบุ
+        และขอให้ระบุรายละเอียดเกี่ยวกับสถานการณ์ที่พบให้ละเอียดชัดเจน จำไว้ว่าข้อความที่ท่านพิมพ์จะปรากฏต่อสาธารณะ
+        ผู้ใช้ทุกท่านไม่จำต้องเข้าใจถึงศัพท์เฉพาะ จึงขอแนะนำให้ใช้ศัพท์อย่างง่าย
+      period: ต้องการกีดกันผู้ใช้คนนี้จาก API นับแต่บัดนี้ นานเท่าใด
+      submit: สร้างการกีดกัน
+      tried_contacting: ข้าพเจ้าติดต่อผู้ใช้คนนี้และขอร้องให้เขาหยุดการกระทำ
+      tried_waiting: ข้าพเจ้าได้ให้เวลานานสมควรแก่ผู้ใช้คนนี้ในการตอบคำถามกลับ
+      needs_view: ผู้ใช้ต้องเข้าระบบก่อนการกีดกันนี้จะถูกเพิกถอน
+      back: แสดงการกีดกันทั้งหมด
+    edit:
+      title: แก้ไขการกีดกันบน %{name}
+      heading: แก้ไขการกีดกันบน %{name}
+      reason: เหตุผลที่ผู้ใช้ %{name} ถูกกีดกัน โปรดอย่าใช้อารมณ์รุนแรงในระหว่างระบุ
+        และขอให้ระบุรายละเอียดเกี่ยวกับสถานการณ์ที่พบให้ละเอียดชัดเจน จำไว้ว่าข้อความที่ท่านพิมพ์จะปรากฏต่อสาธารณะ
+        ผู้ใช้ทุกท่านไม่จำต้องเข้าใจถึงศัพท์เฉพาะ จึงขอแนะนำให้ใช้ศัพท์อย่างง่าย
+      period: ต้องการกีดกันผู้ใช้คนนี้จาก API นับแต่บัดนี้ นานเท่าใด
+      submit: ปรับปรุงการกีดกัน
+      show: ดูการกีดกันนี้
+      back: แสดงการกีดกันทั้งหมด
+      needs_view: ต้องการให้ผู้ใช้คนนี้เข้าระบบก่อนเพิกถอนการกีดกันหรือไม่?
+    filter:
+      block_expired: การกีดกันนี้สิ้นผลแล้วแก้ไขไม่ได้
+    partial:
+      next: ถัดไป »
+      previous: « ก่อนหน้า
+    helper:
+      time_future: จะสิ้นสุดใน %{time}
+    blocks_on:
+      title: การกีดกันบน %{name}
+      heading: รายการการกีดกันบน %{name}
+      empty: '%{name} ยังไม่ได้ถูกกีดกัน'

   note:
   note:

+    rss:
+      title: หมายเหตุแผนที่ บน OpenStreetMap

     entry:
       comment: ความคิดเห็น
     entry:
       comment: ความคิดเห็น

+      full: เนื้อความเต็มในหมายเตุ

   javascripts:
   javascripts:

+    close: ปิด

     share:
     share:

+      title: แบ่งปัน

       cancel: ยกเลิก
       format: 'รูปแบบ:'
       scale: 'ขนาด:'
       short_url: URL สั้น
       include_marker: แสดงไอคอนหมุด
       cancel: ยกเลิก
       format: 'รูปแบบ:'
       scale: 'ขนาด:'
       short_url: URL สั้น
       include_marker: แสดงไอคอนหมุด

+    embed:
+      report_problem: แจ้งปัญหา
+    key:
+      title: ความหมายสัญลักษณ์
+      tooltip: ความหมายสัญลักษณ์

     map:
     map:

+      zoom:
+        in: ซูมเข้า
+        out: ซูมออก
+      locate:
+        title: แสดงตำแหน่งของฉัน

       base:
         standard: ปกติ
         cycle_map: แผนที่จักรยาน
       base:
         standard: ปกติ
         cycle_map: แผนที่จักรยาน


@@ -1672,6 +1842,7 @@ th:
         merge_left_without_exit: เลี้ยวซ้ายเข้าสู่ถนน %{name} ซึ่งเป็นทางเอก
         fork_left_without_exit: ที่ทางแยกเลี้ยวซ้ายไปที่ถนน %{name}
         slight_left_without_exit: ขยับซ้ายเล็กน้อยไปที่ %{name}
         merge_left_without_exit: เลี้ยวซ้ายเข้าสู่ถนน %{name} ซึ่งเป็นทางเอก
         fork_left_without_exit: ที่ทางแยกเลี้ยวซ้ายไปที่ถนน %{name}
         slight_left_without_exit: ขยับซ้ายเล็กน้อยไปที่ %{name}

+        destination_without_exit: ตรงไปยังจุดหมาย

         roundabout_with_exit: ณ วงเวียน ใช้ทางออก %{exit} ไปที่ถนน %{name}
         turn_left_with_exit: ณ วงเวียน เลี้ยวซ้ายไปที่ถนน %{name}
         slight_left_with_exit: ณ วงเวียน ขยับซ้ายไปที่ถนน %{name}
         roundabout_with_exit: ณ วงเวียน ใช้ทางออก %{exit} ไปที่ถนน %{name}
         turn_left_with_exit: ณ วงเวียน เลี้ยวซ้ายไปที่ถนน %{name}
         slight_left_with_exit: ณ วงเวียน ขยับซ้ายไปที่ถนน %{name}

diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 27e926c5f7746670982bd8b6afdd9f07b597946a..e58a452868a704ea58f6a4f8f07a562c58457698 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -76,7 +76,7 @@ tr:
       way_tag: Yol Etiketi
     attributes:
       diary_comment:
       way_tag: Yol Etiketi
     attributes:
       diary_comment:

-        body: Mesaj
+        body: Gövde

       diary_entry:
         user: Kullanıcı
         title: Konu
       diary_entry:
         user: Kullanıcı
         title: Konu


@@ -98,7 +98,7 @@ tr:
       message:
         sender: Gönderen
         title: Konu
       message:
         sender: Gönderen
         title: Konu

-        body: Mesaj
+        body: Gövde

         recipient: Alıcı
       user:
         email: E-posta
         recipient: Alıcı
       user:
         email: E-posta


@@ -153,8 +153,8 @@ tr:
       relation: İlişkiler (%{count})
       relation_paginated: İlişkiler (%{x}-%{y} - toplam %{count})
       comment: Yorumlar (%{count})
       relation: İlişkiler (%{count})
       relation_paginated: İlişkiler (%{x}-%{y} - toplam %{count})
       comment: Yorumlar (%{count})

-      hidden_commented_by: Gizli yorum %{user} <abbr title="%{exact_time}">%{when}
-        önce</abbr>
+      hidden_commented_by: '%{user} tarafından gizli yorum <abbr title="%{exact_time}">%{when}
+        önce</abbr>'

       commented_by: '%{user} kullanıcıdan yorum <abbr title="%{exact_time}">%{when}
         önce</abbr>'
       changesetxml: Değişiklik takımı XML
       commented_by: '%{user} kullanıcıdan yorum <abbr title="%{exact_time}">%{when}
         önce</abbr>'
       changesetxml: Değişiklik takımı XML

diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index 7c8fadb4eaa9994f7fb7a1940a8bbb08c2f5ad7b..a0021b634bc3acaad85c15e5a9da3e2fbc254752 100644 (file)
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -359,7 +359,7 @@ zh-CN:
       map_image: 地图图像 (显示标准图层)
       embeddable_html: 可嵌入HTML
       licence: 许可协议
       map_image: 地图图像 (显示标准图层)
       embeddable_html: 可嵌入HTML
       licence: 许可协议

-      export_details: OpenStreetMap 数据采用<a href="http://opendatacommons.org/licenses/odbl/1.0/">开放数据共享开放数据库许可协议</a>
+      export_details: OpenStreetMap 数据采用<a href="https://opendatacommons.org/licenses/odbl/1.0/">开放数据共享开放数据库许可协议</a>

         (ODbL)授权。
       too_large:
         advice: 如果用上面的导出工具失败了，请考虑使用下面列出的来源来导出：
         (ODbL)授权。
       too_large:
         advice: 如果用上面的导出工具失败了，请考虑使用下面列出的来源来导出：


@@ -394,14 +394,14 @@ zh-CN:
   geocoder:
     search:
       title:
   geocoder:
     search:
       title:

-        latlon: 来自<a href="http://openstreetmap.org/">内部</a>的结果
+        latlon: 来自<a href="https://openstreetmap.org/">内部</a>的结果

         uk_postcode: 来自 <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
           的结果
         uk_postcode: 来自 <a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>
           的结果

-        ca_postcode: 来自 <a href="http://geocoder.ca/">Geocoder.CA</a> 的结果
-        osm_nominatim: 来自 <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        ca_postcode: 来自 <a href="https://geocoder.ca/">Geocoder.CA</a> 的结果
+        osm_nominatim: 来自 <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a> 的结果
         geonames: 来自 <a href="http://www.geonames.org/">GeoNames</a> 的结果
           Nominatim</a> 的结果
         geonames: 来自 <a href="http://www.geonames.org/">GeoNames</a> 的结果

-        osm_nominatim_reverse: 来自 <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim_reverse: 来自 <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a> 的结果
         geonames_reverse: 来自 <a href="http://www.geonames.org/">GeoNames</a> 的结果
     search_osm_nominatim:
           Nominatim</a> 的结果
         geonames_reverse: 来自 <a href="http://www.geonames.org/">GeoNames</a> 的结果
     search_osm_nominatim:


@@ -925,7 +925,7 @@ zh-CN:
         level10: 郊区界
     description:
       title:
         level10: 郊区界
     description:
       title:

-        osm_nominatim: <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim: <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a> 中的位置
         geonames: <a href="http://www.geonames.org/">GeoNames</a> 中的位置
       types:
           Nominatim</a> 中的位置
         geonames: <a href="http://www.geonames.org/">GeoNames</a> 中的位置
       types:


@@ -997,15 +997,15 @@ zh-CN:
       title_html: 著作权与许可
       intro_1_html: |-
         OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup>是<i>开放数据</i>，由<a
       title_html: 著作权与许可
       intro_1_html: |-
         OpenStreetMap<sup><a href="#trademarks">&reg;</a></sup>是<i>开放数据</i>，由<a

-        href="http://osmfoundation.org/">OpenStreetMap基金会</a>（OSMF）采用<a
-        href="http://opendatacommons.org/licenses/odbl/">开放数据共享开放数据库许可协议</a>（ODbL）授权。
+        href="https://osmfoundation.org/">OpenStreetMap基金会</a>（OSMF）采用<a
+        href="https://opendatacommons.org/licenses/odbl/">开放数据共享开放数据库许可协议</a>（ODbL）授权。

       intro_2_html: 只要您表明来源为 OpenStreetMap 及其贡献者，您就可以自由地复制、分发、传送和改编我们的数据。如果您想转换或者以我们的数据为基础进行创作，您只能采用相同的许可协议发表您的作品。完整的<a
       intro_2_html: 只要您表明来源为 OpenStreetMap 及其贡献者，您就可以自由地复制、分发、传送和改编我们的数据。如果您想转换或者以我们的数据为基础进行创作，您只能采用相同的许可协议发表您的作品。完整的<a

-        href="http://opendatacommons.org/licenses/odbl/1.0/">法律文本</a>阐明了您的权利和义务。
-      intro_3_html: 我们的地图图块中的绘图数据以及我们的文档采用<a href="http://creativecommons.org/licenses/by-sa/2.0/deed.zh">知识共享“署名-相同方式共享
+        href="https://opendatacommons.org/licenses/odbl/1.0/">法律文本</a>阐明了您的权利和义务。
+      intro_3_html: 我们的地图图块中的绘图数据以及我们的文档采用<a href="https://creativecommons.org/licenses/by-sa/2.0/deed.zh">知识共享“署名-相同方式共享

         2.0”</a>许可协议授权。
       credit_title_html: 如何表明作者是 OpenStreetMap
       credit_1_html: 我们需要您署名&ldquo;&copy; OpenStreetMap 贡献者&rdquo;。
         2.0”</a>许可协议授权。
       credit_title_html: 如何表明作者是 OpenStreetMap
       credit_1_html: 我们需要您署名&ldquo;&copy; OpenStreetMap 贡献者&rdquo;。

-      credit_2_html: 您必须明确注明，我们的数据使用开放式数据库协议，若使用我们的地图图块，其协议须为 CC-BY-SA。您可以链接<a href="http://www.openstreetmap.org/copyright">此版权页</a>以注明。另外，若您要以数据形式发布
+      credit_2_html: 您必须明确注明，我们的数据使用开放式数据库协议，若使用我们的地图图块，其协议须为 CC-BY-SA。您可以链接<a href="https://www.openstreetmap.org/copyright">此版权页</a>以注明。另外，若您要以数据形式发布

         OSM，您可以属名并直接链接协议。若某些媒介无法进行链接(如印刷品)，我们建议您引导您的读者至 openstreetmap.org (或 OpenStreetMap
         的完整网址)、opendatacommons.org，及可能相关的 creativecommons.org。
       credit_3_html: |-
         OSM，您可以属名并直接链接协议。若某些媒介无法进行链接(如印刷品)，我们建议您引导您的读者至 openstreetmap.org (或 OpenStreetMap
         的完整网址)、opendatacommons.org，及可能相关的 creativecommons.org。
       credit_3_html: |-


@@ -1017,24 +1017,24 @@ zh-CN:
       more_title_html: 了解更多
       more_1_html: |-
         请在<a
       more_title_html: 了解更多
       more_1_html: |-
         请在<a

-        href="http://osmfoundation.org/Licence">OSMF许可协议页面</a>阅读更多关于使用我们的数据，以及如何表明我们是作者的信息。
+        href="https://osmfoundation.org/Licence">OSMF许可协议页面</a>阅读更多关于使用我们的数据，以及如何表明我们是作者的信息。

       more_2_html: 尽管 OpenStreetMap 开放数据，但是我们无法为第三方提供免费的地图 API。详见我们的 <a href="https://operations.osmfoundation.org/policies/api/">API使用政策</a>、<a
         href="https://operations.osmfoundation.org/policies/tiles/">地图图块使用政策</a>及<a
         href="https://operations.osmfoundation.org/policies/nominatim/">名称服务使用政策</a>。
       contributors_title_html: 我们的贡献者
       contributors_intro_html: 我们的数据来源于成千上万人的贡献。但我们也从国家测绘机构等处获取公共版权的数据，其中包括：
       more_2_html: 尽管 OpenStreetMap 开放数据，但是我们无法为第三方提供免费的地图 API。详见我们的 <a href="https://operations.osmfoundation.org/policies/api/">API使用政策</a>、<a
         href="https://operations.osmfoundation.org/policies/tiles/">地图图块使用政策</a>及<a
         href="https://operations.osmfoundation.org/policies/nominatim/">名称服务使用政策</a>。
       contributors_title_html: 我们的贡献者
       contributors_intro_html: 我们的数据来源于成千上万人的贡献。但我们也从国家测绘机构等处获取公共版权的数据，其中包括：

-      contributors_at_html: <strong>奥地利</strong>：包含来自 <a href="http://data.wien.gv.at/">Stadt
-        Wien</a>(<a href="http://creativecommons.org/licenses/by/3.0/at/deed.zh">CC
-        BY</a>协议)、<a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land
-        Vorarlberg</a>及 Land Tirol (修订的 <a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY
+      contributors_at_html: <strong>奥地利</strong>：包含来自 <a href="https://data.wien.gv.at/">Stadt
+        Wien</a>(<a href="https://creativecommons.org/licenses/by/3.0/at/deed.zh">CC
+        BY</a>协议)、<a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land
+        Vorarlberg</a>及 Land Tirol (修订的 <a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY

         AT</a>协议)的数据。
       contributors_ca_html: <strong>加拿大</strong>：含有来自 GeoBase&reg;，GeoGratis(&copy;
         加拿大自然资源部)，CanVec (&copy; 加拿大自然资源部)和StatCan (加拿大统计局地理处)的数据。
         AT</a>协议)的数据。
       contributors_ca_html: <strong>加拿大</strong>：含有来自 GeoBase&reg;，GeoGratis(&copy;
         加拿大自然资源部)，CanVec (&copy; 加拿大自然资源部)和StatCan (加拿大统计局地理处)的数据。

-      contributors_fi_html: <strong>芬兰</strong>：包含来自芬兰国家测绘局地形数据库和其他测绘机构的数据，依据 <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI
+      contributors_fi_html: <strong>芬兰</strong>：包含来自芬兰国家测绘局地形数据库和其他测绘机构的数据，依据 <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1">NLSFI

         协议</a>授权。
       contributors_fr_html: <strong>法国</strong>：含有来自 Direction Générale des Impôts
         的数据。
         协议</a>授权。
       contributors_fr_html: <strong>法国</strong>：含有来自 Direction Générale des Impôts
         的数据。

-      contributors_nl_html: <strong>荷兰</strong>：含有&copy; AND data, 2007(<a href="http://www.and.com">www.and.com</a>)
+      contributors_nl_html: <strong>荷兰</strong>：含有&copy; AND data, 2007(<a href="https://www.and.com">www.and.com</a>)

       contributors_nz_html: <strong>新西兰</strong>：包含来自新西兰土地信息部的数据。Crown 版权所有。
       contributors_si_html: |-
         <strong>斯洛文尼亚</strong>：包含来自
       contributors_nz_html: <strong>新西兰</strong>：包含来自新西兰土地信息部的数据。Crown 版权所有。
       contributors_si_html: |-
         <strong>斯洛文尼亚</strong>：包含来自


@@ -1044,15 +1044,15 @@ zh-CN:
       contributors_gb_html: <strong>英国</strong>：包含来自 Ordnance 的调查数据，&copy; Crown 版权所有及数据库权利，2010-12。
       contributors_footer_1_html: |-
         关于其进一步的细节，及其他被用来帮助提升 OpenStreetMap 的来源，详见 OpenStreetMap Wiki 的<a
       contributors_gb_html: <strong>英国</strong>：包含来自 Ordnance 的调查数据，&copy; Crown 版权所有及数据库权利，2010-12。
       contributors_footer_1_html: |-
         关于其进一步的细节，及其他被用来帮助提升 OpenStreetMap 的来源，详见 OpenStreetMap Wiki 的<a

-        href="http://wiki.openstreetmap.org/wiki/Zh-hans:Contributors">贡献者页面</a>。
+        href="https://wiki.openstreetmap.org/wiki/Zh-hans:Contributors">贡献者页面</a>。

       contributors_footer_2_html: OpenStreetMap 纳入数据并不意味着原始数据提供者认可 OpenStreetMap、提供任何担保或担负任何法律责任。
       infringement_title_html: 著作权侵犯
       infringement_1_html: OSM 的贡献者会被提醒，绝不要在没有著作权人的明确许可时添加来自任何有著作权的来源的数据(如谷歌地图或印刷地图)。
       contributors_footer_2_html: OpenStreetMap 纳入数据并不意味着原始数据提供者认可 OpenStreetMap、提供任何担保或担负任何法律责任。
       infringement_title_html: 著作权侵犯
       infringement_1_html: OSM 的贡献者会被提醒，绝不要在没有著作权人的明确许可时添加来自任何有著作权的来源的数据(如谷歌地图或印刷地图)。

-      infringement_2_html: 如果您认为版权的材料已被不恰当地添加的 OpenStreetMap 数据库或该网站，请参见我们的<a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">撤除程序</a>，或直接在我们的<a
+      infringement_2_html: 如果您认为版权的材料已被不恰当地添加的 OpenStreetMap 数据库或该网站，请参见我们的<a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">撤除程序</a>，或直接在我们的<a

         href="http://dmca.openstreetmap.org/">在线申报页面</a>上提出。
       trademarks_title_html: <span id="trademarks"></span>商标
       trademarks_1_html: OpenStreetMap、放大镜标志和地图状态是OpenStreetMap基金会的注册商标。如果您对使用这些标志有任何问题，请在<a
         href="http://dmca.openstreetmap.org/">在线申报页面</a>上提出。
       trademarks_title_html: <span id="trademarks"></span>商标
       trademarks_1_html: OpenStreetMap、放大镜标志和地图状态是OpenStreetMap基金会的注册商标。如果您对使用这些标志有任何问题，请在<a

-        href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">授权工作组</a>提出您的问题。
+        href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">授权工作组</a>提出您的问题。

   welcome_page:
     title: 欢迎！
     introduction_html: 欢迎访问 OpenStreeMap，自由且可编辑的世界地图。您已经登录，可以开始绘制地图。这里是含有您需要知道的最重要的信息的快速指南。
   welcome_page:
     title: 欢迎！
     introduction_html: 欢迎访问 OpenStreeMap，自由且可编辑的世界地图。您已经登录，可以开始绘制地图。这里是含有您需要知道的最重要的信息的快速指南。


@@ -1070,7 +1070,7 @@ zh-CN:
     rules:
       title: 规则！
       paragraph_1_html: OpenStreetMap很少有正式规则，但我们期待所有参与者能合作，并与社区沟通。如果您在考虑任何除手工编辑的活动，请阅读并遵守<a
     rules:
       title: 规则！
       paragraph_1_html: OpenStreetMap很少有正式规则，但我们期待所有参与者能合作，并与社区沟通。如果您在考虑任何除手工编辑的活动，请阅读并遵守<a

-        href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'>导入</a>和<a href='http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>自动编辑</a>的指导。
+        href='https://wiki.openstreetmap.org/wiki/Import/Guidelines'>导入</a>和<a href='https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>自动编辑</a>的指导。

     questions:
       title: 还有疑问吗？
       paragraph_1_html: OpenStreetMap 有若干资源用于学习该项目，提问和回答问题，以及讨论与制作地图相关的话题并且撰写相关文档。<a
     questions:
       title: 还有疑问吗？
       paragraph_1_html: OpenStreetMap 有若干资源用于学习该项目，提问和回答问题，以及讨论与制作地图相关的话题并且撰写相关文档。<a


@@ -1093,7 +1093,7 @@ zh-CN:
     other_concerns:
       title: 其他问题
       explanation_html: 如果您有关于如何使用我们的数据或内容的关心请查阅我们在<a href='/copyright'>版权页面</a>的更多法律信息，或联系
     other_concerns:
       title: 其他问题
       explanation_html: 如果您有关于如何使用我们的数据或内容的关心请查阅我们在<a href='/copyright'>版权页面</a>的更多法律信息，或联系

-        <a href='http://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF 工作组</a>。
+        <a href='https://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF 工作组</a>。

   help_page:
     title: 获得帮助
     introduction: OpenStreetMap 有若干资源用于学习该项目，提问和回答问题，以及讨论与制作地图相关的话题并且撰写相关文档。
   help_page:
     title: 获得帮助
     introduction: OpenStreetMap 有若干资源用于学习该项目，提问和回答问题，以及讨论与制作地图相关的话题并且撰写相关文档。


@@ -1102,7 +1102,7 @@ zh-CN:
       title: 欢迎访问 OSM
       description: 本快速指南涵盖了快速入门 OpenStreetMap 的基本知识。
     beginners_guide:
       title: 欢迎访问 OSM
       description: 本快速指南涵盖了快速入门 OpenStreetMap 的基本知识。
     beginners_guide:

-      url: http://wiki.openstreetmap.org/wiki/Zh-hans:Beginners%27_guide
+      url: https://wiki.openstreetmap.org/wiki/Zh-hans:Beginners%27_guide

       title: 初学者指南
       description: 社群维护的新手指南。
     help:
       title: 初学者指南
       description: 社群维护的新手指南。
     help:


@@ -1122,7 +1122,7 @@ zh-CN:
       title: switch2osm
       description: 协助公司与组织改用 OpenStreetMap 为基础的地图与相关服务。
     wiki:
       title: switch2osm
       description: 协助公司与组织改用 OpenStreetMap 为基础的地图与相关服务。
     wiki:

-      url: http://wiki.openstreetmap.org/
+      url: https://wiki.openstreetmap.org/

       title: wiki.openstreetmap.org
       description: 浏览 wiki 深入了解 OSM 文档。
   about_page:
       title: wiki.openstreetmap.org
       description: 浏览 wiki 深入了解 OSM 文档。
   about_page:


@@ -1136,17 +1136,17 @@ zh-CN:
     community_driven_title: 社区驱动
     community_driven_html: OpenStreetMap 是一个多元化的社区，它充满激情，并且每天都在成长。我们的参与者包括地图制作爱好者，地理信息系统(GIS)从业人员，维护
       OSM 服务器的工程师，标注灾害区域的人道主义自愿者，已经其他很多各界人士。想更多的了解社区请参见<a href='https://blog.openstreetmap.org'>OpenStreetMap博客</a>、<a
     community_driven_title: 社区驱动
     community_driven_html: OpenStreetMap 是一个多元化的社区，它充满激情，并且每天都在成长。我们的参与者包括地图制作爱好者，地理信息系统(GIS)从业人员，维护
       OSM 服务器的工程师，标注灾害区域的人道主义自愿者，已经其他很多各界人士。想更多的了解社区请参见<a href='https://blog.openstreetmap.org'>OpenStreetMap博客</a>、<a

-      href='%{diary_path}'>用户日记</a>、<a href='http://blogs.openstreetmap.org/'>社区博客</a>，以及
-      <a href='http://www.osmfoundation.org/'>OSM 基金会</a>网站。
+      href='%{diary_path}'>用户日记</a>、<a href='https://blogs.openstreetmap.org/'>社区博客</a>，以及
+      <a href='https://www.osmfoundation.org/'>OSM 基金会</a>网站。

     open_data_title: 开放数据
     open_data_html: OpenStreetMap 是<i>开源数据</i>:只要您表明使用了 OpenStreetMap 并承认其贡献者的工作，您就可以使用
       OpenStreetMap。如果您改变或者使用这些数据，您必须按照相同的版权协议发布结果。详情请参见<a href='%{copyright_path}'>版权协议</a>。
     legal_title: 法律
     legal_html: |-
     open_data_title: 开放数据
     open_data_html: OpenStreetMap 是<i>开源数据</i>:只要您表明使用了 OpenStreetMap 并承认其贡献者的工作，您就可以使用
       OpenStreetMap。如果您改变或者使用这些数据，您必须按照相同的版权协议发布结果。详情请参见<a href='%{copyright_path}'>版权协议</a>。
     legal_title: 法律
     legal_html: |-

-      此网站和很多其他相关服务已由<a href='http://osmfoundation.org/'>OpenStreetMap基金会</a>（OSMF）正式代表社群运营。使用所有由OSMF运营的服务均需符合我们的<a href="http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
-      可接受使用方针</a>和我们的<a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy">隐私政策</a>
+      此网站和很多其他相关服务已由<a href='https://osmfoundation.org/'>OpenStreetMap基金会</a>（OSMF）正式代表社群运营。使用所有由OSMF运营的服务均需符合我们的<a href="https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy">
+      可接受使用方针</a>和我们的<a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy">隐私政策</a>

       <br>
       <br>

-      如果您有许可协议、版权或其他法律问题，请<a href='http://osmfoundation.org/Contact'>联络OSMF</a>。
+      如果您有许可协议、版权或其他法律问题，请<a href='https://osmfoundation.org/Contact'>联络OSMF</a>。

     partners_title: 合作伙伴
   notifier:
     diary_comment_notification:
     partners_title: 合作伙伴
   notifier:
     diary_comment_notification:


@@ -1318,11 +1318,10 @@ zh-CN:
       anon_edits: (%{link})
       anon_edits_link_text: 了解为什么这很重要。
       flash_player_required: 您需要 Flash Player 来使用 OpenStreetMap Flash 编辑器 Potlatch。您可以<a
       anon_edits: (%{link})
       anon_edits_link_text: 了解为什么这很重要。
       flash_player_required: 您需要 Flash Player 来使用 OpenStreetMap Flash 编辑器 Potlatch。您可以<a

-        href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">从
-        Adobe.com 下载 Flash Player</a>。<a href="http://wiki.openstreetmap.org/wiki/Editing">其他几种选择</a>也可以用来编辑
-        OpenStreetMap。
+        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 中保存，如果在在线模式下编辑，您需要取消选择当前的路径或节点；或者点击保存，如果有保存按钮。)
       potlatch_unsaved_changes: 您有尚未保存的修改。(要在 Potlatch 中保存，如果在在线模式下编辑，您需要取消选择当前的路径或节点；或者点击保存，如果有保存按钮。)

-      potlatch2_not_configured: 尚未配置 Potlatch 2 - 请参阅 http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
+      potlatch2_not_configured: 尚未配置 Potlatch 2 - 请参阅 https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2

         以获得更多信息
       potlatch2_unsaved_changes: 您有尚未保存的修改。(要在 Potlatch 2 中保存，您应该点击保存。)
       id_not_configured: iD 尚未配置
         以获得更多信息
       potlatch2_unsaved_changes: 您有尚未保存的修改。(要在 Potlatch 2 中保存，您应该点击保存。)
       id_not_configured: iD 尚未配置


@@ -1413,7 +1412,7 @@ zh-CN:
       edit: 编辑
       preview: 预览
     markdown_help:
       edit: 编辑
       preview: 预览
     markdown_help:

-      title_html: 使用 <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
+      title_html: 使用 <a href="https://daringfireball.net/projects/markdown/">Markdown</a>

         解析
       headings: 标题
       heading: 标题
         解析
       headings: 标题
       heading: 标题


@@ -1517,7 +1516,7 @@ zh-CN:
       public_traces_from: 来自 %{user} 的公开 GPS 轨迹
       description: 浏览最近上传的 GPS 轨迹
       tagged_with: 以 %{tags} 标记
       public_traces_from: 来自 %{user} 的公开 GPS 轨迹
       description: 浏览最近上传的 GPS 轨迹
       tagged_with: 以 %{tags} 标记

-      empty_html: 尚无轨迹。<a href='%{upload_link}'>上传新轨迹</a>或在<a href='http://wiki.openstreetmap.org/wiki/Zh-hans:Beginners_Guide_1.2'>wiki页面</a>上了解
+      empty_html: 尚无轨迹。<a href='%{upload_link}'>上传新轨迹</a>或在<a href='https://wiki.openstreetmap.org/wiki/Zh-hans:Beginners_Guide_1.2'>wiki页面</a>上了解

         GPS 轨迹。
     delete:
       scheduled_for_deletion: 计划删除的轨迹
         GPS 轨迹。
     delete:
       scheduled_for_deletion: 计划删除的轨迹


@@ -1706,10 +1705,10 @@ zh-CN:
         html: |-
           <p>不同于其他地图，OpenStreetMap 是完全由像您一样的人创建的，并且免费提供给任何人用以修正、更新、下载和使用。</p>
           <p>登录来贡献您的力量吧。我们将发送一份邮件来确认您的账号。</p>
         html: |-
           <p>不同于其他地图，OpenStreetMap 是完全由像您一样的人创建的，并且免费提供给任何人用以修正、更新、下载和使用。</p>
           <p>登录来贡献您的力量吧。我们将发送一份邮件来确认您的账号。</p>

-      license_agreement: 当您确认您的帐户时，您需要同意<a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">贡献者条款</a>。
+      license_agreement: 当您确认您的帐户时，您需要同意<a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">贡献者条款</a>。

       email address: 电子邮件地址：
       confirm email address: 确认电子邮件地址：
       email address: 电子邮件地址：
       confirm email address: 确认电子邮件地址：

-      not displayed publicly: 您的地址未公开显示，请参见我们的<a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy"
+      not displayed publicly: 您的地址未公开显示，请参见我们的<a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy"

         title="OSMF隐私政策，包含部分电子邮件地址">隐私政策</a>以获取更多信息
       display name: 显示名称：
       display name description: 您公开显示的用户名。您可以稍后在首选项中进行修改。
         title="OSMF隐私政策，包含部分电子邮件地址">隐私政策</a>以获取更多信息
       display name: 显示名称：
       display name description: 您公开显示的用户名。您可以稍后在首选项中进行修改。


@@ -1721,7 +1720,7 @@ zh-CN:
       continue: 注册
       terms accepted: 感谢您接受新的贡献条款！
       terms declined: 我们很遗憾您已决定不接受新的贡献者条款。有关详细信息，请参阅<a href="%{url}">此 wiki 页面</a>.
       continue: 注册
       terms accepted: 感谢您接受新的贡献条款！
       terms declined: 我们很遗憾您已决定不接受新的贡献者条款。有关详细信息，请参阅<a href="%{url}">此 wiki 页面</a>.

-      terms declined url: http://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined
+      terms declined url: https://wiki.openstreetmap.org/wiki/Contributor_Terms_Declined

     terms:
       title: 贡献者条款
       heading: 贡献者条款
     terms:
       title: 贡献者条款
       heading: 贡献者条款


@@ -1821,26 +1820,26 @@ zh-CN:
       email never displayed publicly: (从不公开显示)
       external auth: 外部身份验证：
       openid:
       email never displayed publicly: (从不公开显示)
       external auth: 外部身份验证：
       openid:

-        link: http://wiki.openstreetmap.org/wiki/OpenID
+        link: https://wiki.openstreetmap.org/wiki/OpenID

         link text: 这是什么？
       public editing:
         heading: 公开编辑：
         enabled: 启用。非匿名用户，可以编辑数据。
         link text: 这是什么？
       public editing:
         heading: 公开编辑：
         enabled: 启用。非匿名用户，可以编辑数据。

-        enabled link: http://wiki.openstreetmap.org/wiki/Anonymous_edits
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits

         enabled link text: 这是什么？
         disabled: 禁用且无法编辑数据，所有过去的编辑均为匿名。
         disabled link text: 我为什么不能编辑？
       public editing note:
         heading: 公开编辑
         text: 目前您的编辑是匿名的，人们不能发送邮件给您或看到您的位置。为了显示您的编辑，让别人通过网站与您联系，请点击下面的按钮。<b>由于 0.6
         enabled link text: 这是什么？
         disabled: 禁用且无法编辑数据，所有过去的编辑均为匿名。
         disabled link text: 我为什么不能编辑？
       public editing note:
         heading: 公开编辑
         text: 目前您的编辑是匿名的，人们不能发送邮件给您或看到您的位置。为了显示您的编辑，让别人通过网站与您联系，请点击下面的按钮。<b>由于 0.6

-          API 的转换，只有公开的用户可以编辑地图数据</b>。(<a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">了解为什么</a>)。<ul><li>您的电子邮件地址将不会被因为成为公开用户而被透露。</li><li>此操作无法撤销，所有新用户现在都默认为公开的。</li></ul>
+          API 的转换，只有公开的用户可以编辑地图数据</b>。(<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">了解为什么</a>)。<ul><li>您的电子邮件地址将不会被因为成为公开用户而被透露。</li><li>此操作无法撤销，所有新用户现在都默认为公开的。</li></ul>

       contributor terms:
         heading: 贡献者条款：
         agreed: 您已同意新的贡献者条款。
         not yet agreed: 您还没有同意新的贡献者条款。
         review link text: 请跟随此链接，方便您查看并接受新的贡献者条款。
         agreed_with_pd: 您也将您的编辑释于公共领域。
       contributor terms:
         heading: 贡献者条款：
         agreed: 您已同意新的贡献者条款。
         not yet agreed: 您还没有同意新的贡献者条款。
         review link text: 请跟随此链接，方便您查看并接受新的贡献者条款。
         agreed_with_pd: 您也将您的编辑释于公共领域。

-        link: http://www.osmfoundation.org/wiki/License/Contributor_Terms
+        link: https://www.osmfoundation.org/wiki/License/Contributor_Terms

         link text: 这是什么？
       profile description: 基本信息说明：
       preferred languages: 首选语言：
         link text: 这是什么？
       profile description: 基本信息说明：
       preferred languages: 首选语言：

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index da5f9e30f609e73db3f7be1b48e8433116d0b0e5..bce5ba3950d18b29779fae14e4c09bebbea5a9b2 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -357,8 +357,8 @@ zh-TW:
       map_image: 地圖影像 (顯示標準圖層)
       embeddable_html: 內嵌式 HTML
       licence: 授權
       map_image: 地圖影像 (顯示標準圖層)
       embeddable_html: 內嵌式 HTML
       licence: 授權

-      export_details: OpenStreetMap 的資料採用 <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open
-        Data Commons 開放資料庫授權條款</a> (ODbL) 授權。
+      export_details: OpenStreetMap 的資料採用 <a href="https://opendatacommons.org/licenses/odbl/1.0/">Open
+        Data Commons 開放資料庫授權條款</a>（ODbL）授權。

       too_large:
         advice: 若以上匯出失敗，請考慮使用下列來源：
         body: 這個區域太大，無法匯出 OpenStreetMap XML 資料。請放大或選擇一個較小的區域，或使用下列大量資料下載源：
       too_large:
         advice: 若以上匯出失敗，請考慮使用下列來源：
         body: 這個區域太大，無法匯出 OpenStreetMap XML 資料。請放大或選擇一個較小的區域，或使用下列大量資料下載源：


@@ -392,14 +392,14 @@ zh-TW:
   geocoder:
     search:
       title:
   geocoder:
     search:
       title:

-        latlon: 來自<a href="http://openstreetmap.org/">內部</a>的結果
+        latlon: 來自<a href="https://openstreetmap.org/">內部</a>的結果

         uk_postcode: 來自<a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>的結果
         uk_postcode: 來自<a href="http://www.npemap.org.uk/">NPEMap / FreeThe Postcode</a>的結果

-        ca_postcode: 來自<a href="http://geocoder.ca/">Geocoder.CA</a>的結果
-        osm_nominatim: 來自<a href="http://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>的結果
+        ca_postcode: 來自 <a href="https://geocoder.ca/">Geocoder.CA</a> 的結果
+        osm_nominatim: 來自 <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
+          Nominatim</a> 的結果

         geonames: 來自<a href="http://www.geonames.org/">GeoNames</a>的結果
         geonames: 來自<a href="http://www.geonames.org/">GeoNames</a>的結果

-        osm_nominatim_reverse: 來自<a href="http://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>的結果
+        osm_nominatim_reverse: 來自 <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
+          Nominatim</a> 的結果

         geonames_reverse: 來自<a href="http://www.geonames.org/">GeoNames</a>的結果
     search_osm_nominatim:
       prefix:
         geonames_reverse: 來自<a href="http://www.geonames.org/">GeoNames</a>的結果
     search_osm_nominatim:
       prefix:


@@ -921,7 +921,7 @@ zh-TW:
         level10: 郊區邊界
     description:
       title:
         level10: 郊區邊界
     description:
       title:

-        osm_nominatim: 來自 <a href="http://nominatim.openstreetmap.org/">OpenStreetMap
+        osm_nominatim: 來自 <a href="https://nominatim.openstreetmap.org/">OpenStreetMap

           Nominatim</a> 的位置
         geonames: 位置來自 <a href="http://www.geonames.org/">GeoNames</a>的位置
       types:
           Nominatim</a> 的位置
         geonames: 位置來自 <a href="http://www.geonames.org/">GeoNames</a>的位置
       types:


@@ -988,17 +988,18 @@ zh-TW:
       mapping_link: 開始製圖
     legal_babble:
       title_html: 版權與授權條款
       mapping_link: 開始製圖
     legal_babble:
       title_html: 版權與授權條款

-      intro_1_html: OpenStreetMap 為<i>開放資料</i>，以<a href="http://opendatacommons.org/licenses/odbl/">Open
-        Data Commons 開放資料庫授權條款</a> (ODbL) 授權。
+      intro_1_html: OpenStreetMap 為<i>開放資料</i>，以<a href="https://osmfoundation.org/">
+        OpenStreetMap 基金會</a>（OSMF）採用的<a href="https://opendatacommons.org/licenses/odbl/">
+        Open Data Commons 開放資料庫授權條款</a>（ODbL）授權。

       intro_2_html: |-
         您可以自由地複製、散布、傳輸及修改我們的資料，前提是您須標明作者為 OpenStreetMap 及其貢獻者。若您在我們的資料上作修改或據之衍生其他資料
       intro_2_html: |-
         您可以自由地複製、散布、傳輸及修改我們的資料，前提是您須標明作者為 OpenStreetMap 及其貢獻者。若您在我們的資料上作修改或據之衍生其他資料

-        ，則只可依相同授權條款散佈有關成果。授權的<a href="http://opendatacommons.org/licenses/odbl/1.0/">法律原文</a>詳述您的權責。
-      intro_3_html: 我們地圖影像塊的製圖法以及我們的文件，以<a href="http://creativecommons.org/licenses/by-sa/2.0/deed.zh_TW">創用CC
+        ，則只可依相同授權條款散佈有關成果。授權的<a href="https://opendatacommons.org/licenses/odbl/1.0/">法律原文</a>詳述您的權責。
+      intro_3_html: 我們地圖影像塊的製圖法以及我們的文件，以<a href="https://creativecommons.org/licenses/by-sa/2.0/deed.zh_TW">創用CC

         姓名標示-相同方式分享 (CC BY-SA) 2.0版</a>條款授權。
       credit_title_html: 如何標明作者是 OpenStreetMap
       credit_1_html: 我們要求您以&ldquo;&copy; OpenStreetMap 貢獻者&rdquo;標明作者。
       credit_2_html: 您亦須清晰註明，有關資料可透過開放資料庫授權條款取得。若使用我們的影像塊，則須註明其製圖法是按 CC-BY-SA 授權。您可以透過連結至<a
         姓名標示-相同方式分享 (CC BY-SA) 2.0版</a>條款授權。
       credit_title_html: 如何標明作者是 OpenStreetMap
       credit_1_html: 我們要求您以&ldquo;&copy; OpenStreetMap 貢獻者&rdquo;標明作者。
       credit_2_html: 您亦須清晰註明，有關資料可透過開放資料庫授權條款取得。若使用我們的影像塊，則須註明其製圖法是按 CC-BY-SA 授權。您可以透過連結至<a

-        href="http://www.openstreetmap.org/copyright">此版權頁</a>以作註明。您亦可以指明並直接連結至授權內容
+        href="https://www.openstreetmap.org/copyright">此版權頁</a>以作註明。您亦可以指明並直接連結至授權內容

         (但若您要以資料形式發布 OSM，這是必要條件) 。在無法作出連結的媒體 (如印刷品) ，我們建議你引導你的讀者至 openstreetmap.org
         (如註明 OpenStreetMap 的完整網址) 、opendatacommons.org，及 (如相關的話) creativecommons.org。
       credit_3_html: |-
         (但若您要以資料形式發布 OSM，這是必要條件) 。在無法作出連結的媒體 (如印刷品) ，我們建議你引導你的讀者至 openstreetmap.org
         (如註明 OpenStreetMap 的完整網址) 、opendatacommons.org，及 (如相關的話) creativecommons.org。
       credit_3_html: |-


@@ -1010,17 +1011,17 @@ zh-TW:
       more_title_html: 尋找更多
       more_1_html: |-
         在<a
       more_title_html: 尋找更多
       more_1_html: |-
         在<a

-        href="http://osmfoundation.org/Licence"> OSMF 授權條款頁面</a>可閱讀更多關於使用我們的資料，以及如何標明我們是作者的資料。
+        href="https://osmfoundation.org/Licence"> OSMF 授權條款頁面</a>可閱讀更多關於使用我們的資料，以及如何標明我們是作者的資料。

       more_2_html: 雖然 OpenStreetMap 是開放資料，但我們無法為第三方提供免費的地圖 API。詳見我們的<a href="https://operations.osmfoundation.org/policies/api/">API
         使用政策</a>、<a href="https://operations.osmfoundation.org/policies/tiles/">地圖影像塊使用政策</a>及<a
         href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim
         服務使用政策</a>。
       contributors_title_html: 我們的貢獻者
       contributors_intro_html: 我們的貢獻者為成千上萬的人。我們也收納了從國家測繪機構及其他來源等取得的開放版權資料，其中包括：
       more_2_html: 雖然 OpenStreetMap 是開放資料，但我們無法為第三方提供免費的地圖 API。詳見我們的<a href="https://operations.osmfoundation.org/policies/api/">API
         使用政策</a>、<a href="https://operations.osmfoundation.org/policies/tiles/">地圖影像塊使用政策</a>及<a
         href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim
         服務使用政策</a>。
       contributors_title_html: 我們的貢獻者
       contributors_intro_html: 我們的貢獻者為成千上萬的人。我們也收納了從國家測繪機構及其他來源等取得的開放版權資料，其中包括：

-      contributors_at_html: <strong>奧地利</strong>：包含來自 <a href="http://data.wien.gv.at/">Stadt
-        Wien</a> (<a href="http://creativecommons.org/licenses/by/3.0/at/deed.zh_TW">CC
-        BY</a>授權) 、<a href="http://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land
-        Vorarlberg</a>及 Land Tirol (修訂的<a href="http://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY
+      contributors_at_html: <strong>奧地利</strong>：包含來自 <a href="https://data.wien.gv.at/">Stadt
+        Wien</a> (<a href="https://creativecommons.org/licenses/by/3.0/at/deed.zh_TW">CC
+        BY</a>授權) 、<a href="https://www.vorarlberg.at/vorarlberg/bauen_wohnen/bauen/vermessung_geoinformation/weitereinformationen/services/wmsdienste.htm">Land
+        Vorarlberg</a>及 Land Tirol (修訂的<a href="https://www.tirol.gv.at/applikationen/e-government/data/nutzungsbedingungen/">CC-BY

         AT</a>授權) 的資料。
       contributors_ca_html: |-
         <strong>加拿大</strong>：包含來自 GeoBase&reg;，GeoGratis (&copy; Department of Natural
         AT</a>授權) 的資料。
       contributors_ca_html: |-
         <strong>加拿大</strong>：包含來自 GeoBase&reg;，GeoGratis (&copy; Department of Natural


@@ -1031,13 +1032,13 @@ zh-TW:
         <strong>芬蘭</strong>: 包含來自
         National Land Survey of Finland's Topographic Database
         及其他資料集的資料，以
         <strong>芬蘭</strong>: 包含來自
         National Land Survey of Finland's Topographic Database
         及其他資料集的資料，以

-        <a href="http://www.maanmittauslaitos.fi/en/NLS_open_data_licence_version1_20120501">NLSFI License</a>授權。
+        <a href="https://www.maanmittauslaitos.fi/en/opendata-licence-version1"> NLSFI License </a>授權。

       contributors_fr_html: |-
         <strong>法國</strong>: 包含來自
         Direction Générale des Impôts 的資料。
       contributors_nl_html: |-
         <strong>荷蘭</strong>: 包含來自&copy; AND data, 2007
       contributors_fr_html: |-
         <strong>法國</strong>: 包含來自
         Direction Générale des Impôts 的資料。
       contributors_nl_html: |-
         <strong>荷蘭</strong>: 包含來自&copy; AND data, 2007

-        (<a href="http://www.and.com">www.and.com</a>) 的資料。
+        (<a href="https://www.and.com">www.and.com</a>) 的資料。

       contributors_nz_html: |-
         <strong>紐西蘭</strong>: 包含來自
         Land Information New Zealand (Crown Copyright reserved) 的資料。
       contributors_nz_html: |-
         <strong>紐西蘭</strong>: 包含來自
         Land Information New Zealand (Crown Copyright reserved) 的資料。


@@ -1055,18 +1056,18 @@ zh-TW:
         2010-12) 的資料。
       contributors_footer_1_html: |-
         若需要進一步詳情，以及其他曾用以協助改進
         2010-12) 的資料。
       contributors_footer_1_html: |-
         若需要進一步詳情，以及其他曾用以協助改進

-         OpenStreetMap 的資料來源，請參閱 OpenStreetMap Wiki 上的 <a
-        href="http://wiki.openstreetmap.org/wiki/Contributors">貢獻者
+         OpenStreetMap 的資料來源，請參閱 OpenStreetMap Wiki 上的<a
+        href="https://wiki.openstreetmap.org/wiki/Contributors">貢獻者

         頁面</a>。
       contributors_footer_2_html: OpenStreetMap 收錄一項資料，並不意味原本的資料提供者認可 OpenStreetMap、提供任何保證或承擔任何法律責任。
       infringement_title_html: 侵犯版權
       infringement_1_html: OSM 的貢獻者會被提醒，絕不要在沒有版權所有人的明確淮許下，加入來自任何有版權的來源的資料 (如 Google
         地圖或印刷地圖)。
         頁面</a>。
       contributors_footer_2_html: OpenStreetMap 收錄一項資料，並不意味原本的資料提供者認可 OpenStreetMap、提供任何保證或承擔任何法律責任。
       infringement_title_html: 侵犯版權
       infringement_1_html: OSM 的貢獻者會被提醒，絕不要在沒有版權所有人的明確淮許下，加入來自任何有版權的來源的資料 (如 Google
         地圖或印刷地圖)。

-      infringement_2_html: 如果你認為有版權的材料被不恰當地加入到 OpenStreetMap 資料庫或此網站，請請參考我們的<a href="http://www.osmfoundation.org/wiki/License/Takedown_procedure">撤除程序</a>，或直接在我們的<a
+      infringement_2_html: 如果你認為有版權的材料被不恰當地加入到 OpenStreetMap 資料庫或此網站，請請參考我們的<a href="https://www.osmfoundation.org/wiki/License/Takedown_procedure">撤除程序</a>，或直接在我們的<a

         href="http://dmca.openstreetmap.org/">網上申報頁面</a>提出。
       trademarks_title_html: <span id="trademarks"></span>商標
       trademarks_1_html: OpenStreetMap、放大鏡標誌和 OpenStreetMap 研討會是 OpenStreetMap 基金會的註冊商標。如果你對於使用這些商標有疑問的話，請將你的問題寄到<a
         href="http://dmca.openstreetmap.org/">網上申報頁面</a>提出。
       trademarks_title_html: <span id="trademarks"></span>商標
       trademarks_1_html: OpenStreetMap、放大鏡標誌和 OpenStreetMap 研討會是 OpenStreetMap 基金會的註冊商標。如果你對於使用這些商標有疑問的話，請將你的問題寄到<a

-        href="http://wiki.osmfoundation.org/wiki/Licensing_Working_Group">授權條款工作小組
+        href="https://wiki.osmfoundation.org/wiki/Licensing_Working_Group">授權條款工作小組

         (Licence Working Group)</a>。
   welcome_page:
     title: 歡迎！
         (Licence Working Group)</a>。
   welcome_page:
     title: 歡迎！


@@ -1088,7 +1089,7 @@ zh-TW:
     rules:
       title: 規則！
       paragraph_1_html: OpenStreetMap 沒有多少正式規則，除了所有參與者都得與社群合作和溝通。如果你有想過用人工以外的方式參與的話，請先熟讀和遵循<a
     rules:
       title: 規則！
       paragraph_1_html: OpenStreetMap 沒有多少正式規則，除了所有參與者都得與社群合作和溝通。如果你有想過用人工以外的方式參與的話，請先熟讀和遵循<a

-        href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'>匯入</a>以及<a href='http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>自動化編輯</a>守則。
+        href='https://wiki.openstreetmap.org/wiki/Import/Guidelines'>匯入</a>以及<a href='https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>自動化編輯</a>守則。

     questions:
       title: 有任何問題嗎？
       paragraph_1_html: OpenStreetMap 有一些資源，可用於學習本專案、提出和回答問題，以及討論和紀錄與製作地圖相關的話題。 <a
     questions:
       title: 有任何問題嗎？
       paragraph_1_html: OpenStreetMap 有一些資源，可用於學習本專案、提出和回答問題，以及討論和紀錄與製作地圖相關的話題。 <a


@@ -1112,7 +1113,7 @@ zh-TW:
     other_concerns:
       title: 其他問題
       explanation_html: 如果您對我們的資料如何被應用或有關的內容有任何問題，請參閱我們的<a href='/copyright'>版權頁</a>瞭解更多法律資訊，或聯絡適當的<a
     other_concerns:
       title: 其他問題
       explanation_html: 如果您對我們的資料如何被應用或有關的內容有任何問題，請參閱我們的<a href='/copyright'>版權頁</a>瞭解更多法律資訊，或聯絡適當的<a

-        href='http://wiki.osmfoundation.org/wiki/Working_Groups'>OSMF 工作小組</a>。
+        href='https://wiki.osmfoundation.org/wiki/Working_Groups'> OSMF 工作小組</a>。

   help_page:
     title: 取得協助
     introduction: OpenStreetMap 有一些資源，可用於學習本專案、提出和回答問題，以及討論和紀錄與製作地圖相關的話題。
   help_page:
     title: 取得協助
     introduction: OpenStreetMap 有一些資源，可用於學習本專案、提出和回答問題，以及討論和紀錄與製作地圖相關的話題。


@@ -1121,7 +1122,7 @@ zh-TW:
       title: 歡迎來到開放街圖
       description: 這個快速指南涵蓋了開放街圖的基礎知識。
     beginners_guide:
       title: 歡迎來到開放街圖
       description: 這個快速指南涵蓋了開放街圖的基礎知識。
     beginners_guide:

-      url: http://wiki.openstreetmap.org/wiki/Zh-hant:Beginners%27_guide
+      url: https://wiki.openstreetmap.org/wiki/Zh-hant:Beginners%27_guide

       title: 新手指南
       description: 社群維護的新手指南
     help:
       title: 新手指南
       description: 社群維護的新手指南
     help:


@@ -1141,7 +1142,7 @@ zh-TW:
       title: switch2osm
       description: 協助公司與組織改用 OpenStreetMap 為基礎的地圖與相關服務。
     wiki:
       title: switch2osm
       description: 協助公司與組織改用 OpenStreetMap 為基礎的地圖與相關服務。
     wiki:

-      url: http://wiki.openstreetmap.org/
+      url: https://wiki.openstreetmap.org/

       title: wiki.openstreetmap.org
       description: 瀏覽 wiki，取得詳盡的 OSM 文件。
   about_page:
       title: wiki.openstreetmap.org
       description: 瀏覽 wiki，取得詳盡的 OSM 文件。
   about_page:


@@ -1158,15 +1159,15 @@ zh-TW:
     community_driven_html: |-
       OpenStreetMap 的社群多元化、懷有熱情，而且日益壯大。我們的貢獻者包括地圖製作愛好者，地理訊息系統的專業人員，提供 OSM 伺服器的工程師，為受災害影響區域製圖的人道主義志願人士，以及其他各界人士。
       想進一步了解這個社群，請參閱<a href='https://blog.openstreetmap.org'> OpenStreetMap 部落格</a>、<a href='%{diary_path}'>使用者日記</a>,
     community_driven_html: |-
       OpenStreetMap 的社群多元化、懷有熱情，而且日益壯大。我們的貢獻者包括地圖製作愛好者，地理訊息系統的專業人員，提供 OSM 伺服器的工程師，為受災害影響區域製圖的人道主義志願人士，以及其他各界人士。
       想進一步了解這個社群，請參閱<a href='https://blog.openstreetmap.org'> OpenStreetMap 部落格</a>、<a href='%{diary_path}'>使用者日記</a>,

-      <a href='http://blogs.openstreetmap.org/'>社群部落格</a>，以及<a href='http://www.osmfoundation.org/'>OSM 基金會</a> 網站。
+      <a href='https://blogs.openstreetmap.org/'>社群部落格</a>，以及<a href='https://www.osmfoundation.org/'> OSM 基金會</a> 網站。

     open_data_title: 開放資料
     open_data_html: OpenStreetMap 是<i>開放資料</i>的：您可以自由地使用作任何用途，前提是您須標明作者為 OpenStreetMap
       及其貢獻者。若您在我們的資料上作修改或以之透過某些方式衍生其他資料，則只可依相同授權條款散佈有關成果。詳情請參閱<a href='%{copyright_path}'>版權及授權條款頁面</a>。
     legal_title: 法律資訊
     open_data_title: 開放資料
     open_data_html: OpenStreetMap 是<i>開放資料</i>的：您可以自由地使用作任何用途，前提是您須標明作者為 OpenStreetMap
       及其貢獻者。若您在我們的資料上作修改或以之透過某些方式衍生其他資料，則只可依相同授權條款散佈有關成果。詳情請參閱<a href='%{copyright_path}'>版權及授權條款頁面</a>。
     legal_title: 法律資訊

-    legal_html: "本站以及許多相關的服務正式由<a href='http://osmfoundation.org/'>OpenStreetMap 基金會</a>
-      (OSMF) 代表社群所營運。所有使用的OSMF運行服務皆符合我們的<a href=\"http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">可接受使用政策</a>和<a
-      href=\"http://wiki.osmfoundation.org/wiki/Privacy_Policy\">隱私政策</a>\n<br> \n若您有任何授權、版權或其他法律諮詢與問題，請<a
-      href='http://osmfoundation.org/Contact'>聯絡 OSMF</a>。"
+    legal_html: "本站以及許多相關的服務正式由<a href='https://osmfoundation.org/'>OpenStreetMap
+      基金會</a>（OSMF）代表社群所營運。所有使用的OSMF運行服務皆符合我們的<a href=\"https://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">可接受使用政策</a>和<a
+      href=\"https://wiki.osmfoundation.org/wiki/Privacy_Policy\">隱私政策</a>\n<br> \n若您有任何授權、版權或其他法律諮詢與問題，請<a
+      href='https://osmfoundation.org/Contact'>聯絡 OSMF</a>。"

     partners_title: 合作夥伴
   notifier:
     diary_comment_notification:
     partners_title: 合作夥伴
   notifier:
     diary_comment_notification:


@@ -1341,12 +1342,11 @@ zh-TW:
       user_page_link: 使用者頁面
       anon_edits_link_text: 瞭解為什麼這很重要。
       flash_player_required: 您需要 Flash player 才能使用 Potlatch，OpenStreetMap Flash 編輯器。您可以<a
       user_page_link: 使用者頁面
       anon_edits_link_text: 瞭解為什麼這很重要。
       flash_player_required: 您需要 Flash player 才能使用 Potlatch，OpenStreetMap Flash 編輯器。您可以<a

-        href="http://www.adobe.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash">在
-        Adobe.com 下載 Flash Player</a>。<a href="http://wiki.openstreetmap.org/wiki/Editing">還有其他許多選擇</a>也可以編輯
-        OpenStreetMap。
+        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 中儲存，您應該取消選擇目前的路徑或節點 (如果是在清單模式編輯)，或是點選儲存
         (如果有儲存按鈕)。)
       potlatch_unsaved_changes: 您還有未儲存的變更。 (要在 Potlatch 中儲存，您應該取消選擇目前的路徑或節點 (如果是在清單模式編輯)，或是點選儲存
         (如果有儲存按鈕)。)

-      potlatch2_not_configured: Potlatch 2 尚未設定 - 請參閱 http://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2
+      potlatch2_not_configured: Potlatch 2 尚未設定 - 請參閱 https://wiki.openstreetmap.org/wiki/The_Rails_Port#Potlatch_2

         以取得更多資訊
       potlatch2_unsaved_changes: 您有未儲存的更改。 (要在 Potlatch 2 中儲存，您應按一下儲存。)
       id_not_configured: iD 尚未設定
         以取得更多資訊
       potlatch2_unsaved_changes: 您有未儲存的更改。 (要在 Potlatch 2 中儲存，您應按一下儲存。)
       id_not_configured: iD 尚未設定


@@ -1437,7 +1437,7 @@ zh-TW:
       edit: 編輯
       preview: 預覽
     markdown_help:
       edit: 編輯
       preview: 預覽
     markdown_help:

-      title_html: 使用 <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
+      title_html: 使用 <a href="https://daringfireball.net/projects/markdown/">Markdown</a>

         解析
       headings: 標題
       heading: 標題
         解析
       headings: 標題
       heading: 標題


@@ -1538,7 +1538,7 @@ zh-TW:
       public_traces_from: '%{user} 的公開 GPS 軌跡'
       description: 瀏覽最近的 GPS 軌跡上傳
       tagged_with: 有如下標籤：%{tags}
       public_traces_from: '%{user} 的公開 GPS 軌跡'
       description: 瀏覽最近的 GPS 軌跡上傳
       tagged_with: 有如下標籤：%{tags}

-      empty_html: 還沒有軌跡。<a href='%{upload_link}'>上傳新的軌跡</a>或在 <a href='http://wiki.openstreetmap.org/wiki/Zh-hant:Beginners_Guide_1.2'>wiki
+      empty_html: 還沒有軌跡。<a href='%{upload_link}'>上傳新的軌跡</a>或在 <a href='https://wiki.openstreetmap.org/wiki/Zh-hant:Beginners_Guide_1.2'>wiki

         頁面</a>上瞭解更多有關 GPS 軌跡的資訊。
     delete:
       scheduled_for_deletion: 軌跡已被排程刪除
         頁面</a>上瞭解更多有關 GPS 軌跡的資訊。
     delete:
       scheduled_for_deletion: 軌跡已被排程刪除


@@ -1727,11 +1727,11 @@ zh-TW:
         html: |-
           <p>與其他地圖不同，OpenStreetMap 是完全由像你一樣的人們建立的，而且任何人都可自由地修正、更新、下載和使用。</p>
           <p>請註冊以開始貢獻吧。我們將發出電子郵件以確認你的帳號。</p>
         html: |-
           <p>與其他地圖不同，OpenStreetMap 是完全由像你一樣的人們建立的，而且任何人都可自由地修正、更新、下載和使用。</p>
           <p>請註冊以開始貢獻吧。我們將發出電子郵件以確認你的帳號。</p>

-      license_agreement: 當您確認您的帳號，您需要同意<a href="http://www.osmfoundation.org/wiki/License/Contributor_Terms">貢獻者條款</a>
+      license_agreement: 當您確認您的帳號，您需要同意<a href="https://www.osmfoundation.org/wiki/License/Contributor_Terms">貢獻者條款</a>

         。
       email address: 電子郵件地址：
       confirm email address: 確認電子郵件地址：
         。
       email address: 電子郵件地址：
       confirm email address: 確認電子郵件地址：

-      not displayed publicly: 您的地址未公開顯示，請看我們的<a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy"
+      not displayed publicly: 您的地址未公開顯示，請看我們的<a href="https://wiki.osmfoundation.org/wiki/Privacy_Policy"

         title="包含部份電郵地址的OSMF隱私權政策">隱私權政策</a>來獲得更多訊息
       display name: 顯示名稱：
       display name description: 您公開顯示的使用者名稱。您可以稍後在偏好設定中改變它。
         title="包含部份電郵地址的OSMF隱私權政策">隱私權政策</a>來獲得更多訊息
       display name: 顯示名稱：
       display name description: 您公開顯示的使用者名稱。您可以稍後在偏好設定中改變它。


@@ -1840,21 +1840,20 @@ zh-TW:
       email never displayed publicly: (永遠不公開顯示)
       external auth: 外部認證：
       openid:
       email never displayed publicly: (永遠不公開顯示)
       external auth: 外部認證：
       openid:

-        link: HTTP://wiki.openstreetmap.org/wiki/OpenID
+        link: https://wiki.openstreetmap.org/wiki/OpenID

         link text: 這是什麼？
       public editing:
         heading: 公開編輯：
         enabled: 已開啟。非匿名且可以編輯資料。
         link text: 這是什麼？
       public editing:
         heading: 公開編輯：
         enabled: 已開啟。非匿名且可以編輯資料。

-        enabled link: http://wiki.openstreetmap.org/wiki/Disabling_anonymous_edits
+        enabled link: https://wiki.openstreetmap.org/wiki/Anonymous_edits

         enabled link text: 這是什麼？
         disabled: 已停用且不能編輯資料，所有先前的編輯都會成為匿名的。
         disabled link text: 為什麼我不能編輯？
       public editing note:
         heading: 公開編輯
         text: 目前您的編輯是匿名的，人們不能發送郵件給您或看到您的位置。為了顯示你的編輯，讓別人透過網站與您聯繫，請點選下面的按鈕。 <b>由於 0.6
         enabled link text: 這是什麼？
         disabled: 已停用且不能編輯資料，所有先前的編輯都會成為匿名的。
         disabled link text: 為什麼我不能編輯？
       public editing note:
         heading: 公開編輯
         text: 目前您的編輯是匿名的，人們不能發送郵件給您或看到您的位置。為了顯示你的編輯，讓別人透過網站與您聯繫，請點選下面的按鈕。 <b>由於 0.6

-          API 的轉換，只有公開的使用者可以編輯地圖資料</b> 。  ( <a href="http://wiki.openstreetmap.org/wiki/Anonymous_edits">知道為什麼</a>
-          ) 。 <ul><li>您的電子郵件地址將不會被因為成為公開使用者而被透露。 </li><li>這個動作不能逆轉，所有新的使用者現在都預設為公開的。
-          </li></ul>
+          API 的轉換，只有公開的使用者可以編輯地圖資料</b>。（<a href="https://wiki.openstreetmap.org/wiki/Anonymous_edits">知道為什麼</a>）。<ul><li>您的電子郵件地址將不會被因為成為公開使用者而被透露。
+          </li><li>這個動作不能逆轉，所有新的使用者現在都預設為公開的。 </li></ul>

       contributor terms:
         heading: 貢獻者條款：
         agreed: 您已同意新的貢獻者條款。
       contributor terms:
         heading: 貢獻者條款：
         agreed: 您已同意新的貢獻者條款。