Localisation updates from https://translatewiki.net.

diff --git a/config/locales/de.yml b/config/locales/de.yml
index b69cdc5c7bc90f3422f6c4f3a04f4c4b51f561b4..8f7483b7c60d765ef90855237979b7c49a73c2a6 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -7,6 +7,7 @@
 # Author: Avatar
 # Author: Campmaster
 # Author: Candid Dauth
 # Author: Avatar
 # Author: Campmaster
 # Author: Candid Dauth

+# Author: CarstenG

 # Author: ChrisiPK
 # Author: CygnusOlor
 # Author: Daswaldhorn
 # Author: ChrisiPK
 # Author: CygnusOlor
 # Author: Daswaldhorn

diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index c3eca7447d930f9244741fb60785b9e18ce0a2f5..430af7d456b8e94a0ce06262d7dd96ce581756dd 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -17,6 +17,7 @@
 # Author: Meno25
 # Author: Sampablokuper
 # Author: Shirayuki
 # Author: Meno25
 # Author: Sampablokuper
 # Author: Shirayuki

+# Author: Smsm1

 # Author: ديفيد
 ---
 en-GB:
 # Author: ديفيد
 ---
 en-GB:


@@ -452,7 +453,7 @@ en-GB:
           clock: Clock
           college: College
           community_centre: Community Centre
           clock: Clock
           college: College
           community_centre: Community Centre

-          courthouse: Courthouse
+          courthouse: Court

           crematorium: Crematorium
           dentist: Dentist
           doctors: Doctors
           crematorium: Crematorium
           dentist: Dentist
           doctors: Doctors


@@ -519,7 +520,7 @@ en-GB:
           vending_machine: Vending Machine
           veterinary: Veterinary Surgery
           village_hall: Village Hall
           vending_machine: Vending Machine
           veterinary: Veterinary Surgery
           village_hall: Village Hall

-          waste_basket: bin
+          waste_basket: Waste Bin

           waste_disposal: Waste Disposal
           youth_centre: Youth Centre
         boundary:
           waste_disposal: Waste Disposal
           youth_centre: Youth Centre
         boundary:


@@ -969,7 +970,7 @@ en-GB:
     intro_2_create_account: Create a user account
     partners_html: Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other
       %{partners}.
     intro_2_create_account: Create a user account
     partners_html: Hosting is supported by %{ucl}, %{ic} and %{bytemark}, and other
       %{partners}.

-    partners_ucl: the UCL VR Centre
+    partners_ucl: UCL

     partners_ic: Imperial College London
     partners_bytemark: Bytemark Hosting
     partners_partners: partners
     partners_ic: Imperial College London
     partners_bytemark: Bytemark Hosting
     partners_partners: partners


@@ -1047,11 +1048,12 @@ en-GB:
         href="http://osmfoundation.org/Licence">OSMF Licence page</a> and the community <a
         href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
         FAQ</a>.
         href="http://osmfoundation.org/Licence">OSMF Licence page</a> and the community <a
         href="http://wiki.openstreetmap.org/wiki/Legal_FAQ">Legal
         FAQ</a>.

-      more_2_html: Although OpenStreetMap is open data, we cannot provide a free-of-charge
-        map API for third-party developers. See our <a href="http://wiki.openstreetmap.org/wiki/API_usage_policy">API
-        Usage Policy</a>, <a href="http://wiki.openstreetmap.org/wiki/Tile_usage_policy">Tile
-        Usage Policy</a> and <a href="http://wiki.openstreetmap.org/wiki/Nominatim#Usage_Policy">Nominatim
-        Usage Policy</a>.
+      more_2_html: |-
+        Although OpenStreetMap is open data, we cannot provide a
+        free-of-charge map API for third-parties.
+        See our <a href="https://operations.osmfoundation.org/policies/api/">API Usage Policy</a>,
+        <a href="https://operations.osmfoundation.org/policies/tiles/">Tile Usage Policy</a>
+        and <a href="https://operations.osmfoundation.org/policies/nominatim/">Nominatim Usage Policy</a>.

       contributors_title_html: Our contributors
       contributors_intro_html: |-
         Our contributors are thousands of individuals. We also include
       contributors_title_html: Our contributors
       contributors_intro_html: |-
         Our contributors are thousands of individuals. We also include


@@ -1241,16 +1243,19 @@ en-GB:
     legal_title: Legal
     legal_html: "This site and many other related services are formally operated by
       the  \n<a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)
     legal_title: Legal
     legal_html: "This site and many other related services are formally operated by
       the  \n<a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF)

-      \non behalf of the community.\n<br> \nPlease <a href='http://osmfoundation.org/Contact'>contact
+      \non behalf of the community. Use of all OSMF operated services is subject \nto
+      our <a href=\"http://wiki.openstreetmap.org/wiki/Acceptable_Use_Policy\">\nAcceptable
+      Use Policies</a> and our <a href=\"http://wiki.osmfoundation.org/wiki/Privacy_Policy\">Privacy
+      Policy</a>\n<br> \nPlease <a href='http://osmfoundation.org/Contact'>contact

       the OSMF</a> \nif you have licensing, copyright or other legal questions and
       issues."
     partners_title: Partners
   notifier:
     diary_comment_notification:
       the OSMF</a> \nif you have licensing, copyright or other legal questions and
       issues."
     partners_title: Partners
   notifier:
     diary_comment_notification:

-      subject: '[OpenStreetMap] %{user} commented on your diary entry'
+      subject: '[OpenStreetMap] %{user} commented on a diary entry'

       hi: Hi %{to_user},
       hi: Hi %{to_user},

-      header: '%{from_user} has commented on your recent OpenStreetMap diary entry
-        with the subject %{subject}:'
+      header: '%{from_user} has commented on the OpenStreetMap diary entry with the
+        subject %{subject}:'

       footer: You can also read the comment at %{readurl} and you can comment at %{commenturl}
         or reply at %{replyurl}
     message_notification:
       footer: You can also read the comment at %{readurl} and you can comment at %{commenturl}
         or reply at %{replyurl}
     message_notification:


@@ -1261,6 +1266,7 @@ en-GB:
       footer_html: You can also read the message at %{readurl} and you can reply at
         %{replyurl}
     friend_notification:
       footer_html: You can also read the message at %{readurl} and you can reply at
         %{replyurl}
     friend_notification:

+      hi: Hi %{to_user},

       subject: '[OpenStreetMap] %{user} added you as a friend'
       had_added_you: '%{user} has added you as a friend on OpenStreetMap.'
       see_their_profile: You can see their profile at %{userurl}.
       subject: '[OpenStreetMap] %{user} added you as a friend'
       had_added_you: '%{user} has added you as a friend on OpenStreetMap.'
       see_their_profile: You can see their profile at %{userurl}.


@@ -1340,6 +1346,7 @@ en-GB:
           on. The note is near %{place}.'
       details: More details about the note can be found at %{url}.
     changeset_comment_notification:
           on. The note is near %{place}.'
       details: More details about the note can be found at %{url}.
     changeset_comment_notification:

+      hi: Hi %{to_user},

       greeting: Hi,
       commented:
         subject_own: '[OpenStreetMap] %{commenter} has commented on one of your changesets'
       greeting: Hi,
       commented:
         subject_own: '[OpenStreetMap] %{commenter} has commented on one of your changesets'


@@ -1352,6 +1359,8 @@ en-GB:
         partial_changeset_with_comment: with comment '%{changeset_comment}'
         partial_changeset_without_comment: without comment
       details: More details about the changeset can be found at %{url}.
         partial_changeset_with_comment: with comment '%{changeset_comment}'
         partial_changeset_without_comment: without comment
       details: More details about the changeset can be found at %{url}.

+      unsubscribe: To unsubscribe from updates to this changeset, visit %{url} and
+        click "Unsubscribe".

   message:
     inbox:
       title: Inbox
   message:
     inbox:
       title: Inbox


@@ -1683,6 +1692,8 @@ en-GB:
     require_moderator:
       not_a_moderator: You need to be a moderator to perform that action.
     setup_user_auth:
     require_moderator:
       not_a_moderator: You need to be a moderator to perform that action.
     setup_user_auth:

+      blocked_zero_hour: You have an urgent message on the OpenStreetMap web site.
+        You need to read the message before you will be able to save your edits.

       blocked: Your access to the API has been blocked. Please log-in to the web interface
         to find out more.
       need_to_see_terms: Your access to the API is temporarily suspended. Please log-in
       blocked: Your access to the API has been blocked. Please log-in to the web interface
         to find out more.
       need_to_see_terms: Your access to the API is temporarily suspended. Please log-in


@@ -1713,6 +1724,8 @@ en-GB:
       invalid: The authorisation token is not valid.
     revoke:
       flash: You've revoked the token for %{application}
       invalid: The authorisation token is not valid.
     revoke:
       flash: You've revoked the token for %{application}

+    permissions:
+      missing: You have not permitted the application access to this facility

   oauth_clients:
     new:
       title: Register a new application
   oauth_clients:
     new:
       title: Register a new application


@@ -1818,6 +1831,9 @@ en-GB:
         github:
           title: Login with GitHub
           alt: Login with a GitHub Account
         github:
           title: Login with GitHub
           alt: Login with a GitHub Account

+        wikipedia:
+          title: Login with Wikipedia
+          alt: Login with a Wikipedia Account

         yahoo:
           title: Login with Yahoo
           alt: Login with a Yahoo OpenID
         yahoo:
           title: Login with Yahoo
           alt: Login with a Yahoo OpenID


@@ -1866,8 +1882,9 @@ en-GB:
         terms</a>.
       email address: 'Email Address:'
       confirm email address: 'Confirm Email Address:'
         terms</a>.
       email address: 'Email Address:'
       confirm email address: 'Confirm Email Address:'

-      not displayed publicly: Not displayed publicly (see <a href="http://wiki.openstreetmap.org/wiki/Privacy_Policy"
-        title="wiki privacy policy including section on email addresses">privacy policy</a>)
+      not displayed publicly: Your address is not displayed publicly, see our <a href="http://wiki.osmfoundation.org/wiki/Privacy_Policy"
+        title="OSMF privacy policy including section on email addresses">privacy policy</a>
+        for more information

       display name: 'Display Name:'
       display name description: Your publicly displayed username. You can change this
         later in the preferences.
       display name: 'Display Name:'
       display name description: Your publicly displayed username. You can change this
         later in the preferences.


@@ -2222,6 +2239,7 @@ en-GB:
     helper:
       time_future: Ends in %{time}.
       until_login: Active until the user logs in.
     helper:
       time_future: Ends in %{time}.
       until_login: Active until the user logs in.

+      time_future_and_until_login: Ends in %{time} and after the user has logged in.

       time_past: Ended %{time} ago.
     blocks_on:
       title: Blocks on %{name}
       time_past: Ended %{time} ago.
     blocks_on:
       title: Blocks on %{name}


@@ -2306,7 +2324,7 @@ en-GB:
     key:
       title: Map Key
       tooltip: Legend
     key:
       title: Map Key
       tooltip: Legend

-      tooltip_disabled: Legend available only for Standard layer
+      tooltip_disabled: Map Key not available for this layer

     map:
       zoom:
         in: Zoom In
     map:
       zoom:
         in: Zoom In


@@ -2323,6 +2341,7 @@ en-GB:
         header: Map Layers
         notes: Map Notes
         data: Map Data
         header: Map Layers
         notes: Map Notes
         data: Map Data

+        gps: Public GPS Traces

         overlays: Enable overlays for troubleshooting the map
         title: Layers
       copyright: © <a href='%{copyright_url}'>OpenStreetMap contributors</a>
         overlays: Enable overlays for troubleshooting the map
         title: Layers
       copyright: © <a href='%{copyright_url}'>OpenStreetMap contributors</a>


@@ -2361,6 +2380,7 @@ en-GB:
     edit_help: Move the map and zoom in on a location you want to edit, then click
       here.
     directions:
     edit_help: Move the map and zoom in on a location you want to edit, then click
       here.
     directions:

+      ascend: Ascend

       engines:
         graphhopper_bicycle: Bicycle (GraphHopper)
         graphhopper_foot: Foot (GraphHopper)
       engines:
         graphhopper_bicycle: Bicycle (GraphHopper)
         graphhopper_foot: Foot (GraphHopper)


@@ -2371,6 +2391,7 @@ en-GB:
         mapzen_bicycle: Bicycle (Mapzen)
         mapzen_car: Car (Mapzen)
         mapzen_foot: Foot (Mapzen)
         mapzen_bicycle: Bicycle (Mapzen)
         mapzen_car: Car (Mapzen)
         mapzen_foot: Foot (Mapzen)

+      descend: Descend

       directions: Directions
       distance: Distance
       errors:
       directions: Directions
       distance: Distance
       errors:


@@ -2405,6 +2426,11 @@ en-GB:
         against_oneway_without_exit: Go against one-way on %{name}
         end_oneway_without_exit: End of one-way on %{name}
         roundabout_with_exit: At roundabout take exit %{exit} onto %{name}
         against_oneway_without_exit: Go against one-way on %{name}
         end_oneway_without_exit: End of one-way on %{name}
         roundabout_with_exit: At roundabout take exit %{exit} onto %{name}

+        turn_left_with_exit: At roundabout turn left onto %{name}
+        slight_left_with_exit: At roundabout slight left onto %{name}
+        turn_right_with_exit: At roundabout turn right onto %{name}
+        slight_right_with_exit: At roundabout slight right onto %{name}
+        continue_with_exit: At roundabout continue straight onto %{name}

         unnamed: unnamed road
         courtesy: Directions courtesy of %{link}
       time: Time
         unnamed: unnamed road
         courtesy: Directions courtesy of %{link}
       time: Time


@@ -2415,6 +2441,13 @@ en-GB:
       nothing_found: No features found
       error: 'Error contacting %{server}: %{error}'
       timeout: Timeout contacting %{server}
       nothing_found: No features found
       error: 'Error contacting %{server}: %{error}'
       timeout: Timeout contacting %{server}

+    context:
+      directions_from: Directions from here
+      directions_to: Directions to here
+      add_note: Add a note here
+      show_address: Show address
+      query_features: Query features
+      centre_map: Centre map here

   redaction:
     edit:
       description: Description
   redaction:
     edit:
       description: Description

diff --git a/config/locales/es.yml b/config/locales/es.yml
index 103ce81defdc0b8c5b623c0373dbd1a65429e859..e4dc8b17534c7cc1cac960dddc0184945cd6eb51 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1562,8 +1562,8 @@ es:
       preview: Vista previa
     markdown_help:
       title_html: Analizado con <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
       preview: Vista previa
     markdown_help:
       title_html: Analizado con <a href="http://daringfireball.net/projects/markdown/">Markdown</a>

-      headings: Encabezados
-      heading: Encabezado
+      headings: Títulos
+      heading: Título

       subheading: Subcabecera
       unordered: Lista sin ordenar
       ordered: Lista ordenada
       subheading: Subcabecera
       unordered: Lista sin ordenar
       ordered: Lista ordenada


@@ -2461,7 +2461,7 @@ es:
       way: Vía
       relation: Relación
       nothing_found: No se encontraron características
       way: Vía
       relation: Relación
       nothing_found: No se encontraron características

-      error: 'Error al contactar a %{server}: %{error}'
+      error: 'Error al contactar con %{server}: %{error}'

       timeout: Tiempo de espera agotado al contactar a %{server}
     context:
       directions_from: Indicaciones desde aquí
       timeout: Tiempo de espera agotado al contactar a %{server}
     context:
       directions_from: Indicaciones desde aquí

diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 2792dac794ce5211d28a03d7d4e52f2f92653031..ca0bb3fd0f8a654b1a13189590ca0b03344aeba0 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -72,10 +72,13 @@ eu:
       name: Potlatch 2
     remote:
       name: Urrutiko Agintea
       name: Potlatch 2
     remote:
       name: Urrutiko Agintea

+      description: Urrutiko kontrola (JOSM edo Merkaartor)

   browse:
     created: Sortua
     closed: Itxita
     version: Bertsioa
   browse:
     created: Sortua
     closed: Itxita
     version: Bertsioa

+    anonymous: anonimoa
+    no_comment: (iruzkinik gabe)

     download_xml: XML deskargatu
     view_history: Ikusi historia
     view_details: Ikusi Xehetasunak
     download_xml: XML deskargatu
     view_history: Ikusi historia
     view_details: Ikusi Xehetasunak


@@ -187,6 +190,7 @@ eu:
       manually_select: Aukeratu eskuz eremu ezberdin bat
       format_to_export: Esportatzeko formatua
       osm_xml_data: OpenStreetMap XML Data
       manually_select: Aukeratu eskuz eremu ezberdin bat
       format_to_export: Esportatzeko formatua
       osm_xml_data: OpenStreetMap XML Data

+      map_image: Maparen Irudia (geruza estandarra erakusten du)

       embeddable_html: HTML integragarria
       licence: Lizentzia
       export_details: OpenStreetMap-eko datuak <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open
       embeddable_html: HTML integragarria
       licence: Lizentzia
       export_details: OpenStreetMap-eko datuak <a href="http://opendatacommons.org/licenses/odbl/1.0/">Open


@@ -860,6 +864,10 @@ eu:
           summit:
           - Tontorra
           - gailurra
           summit:
           - Tontorra
           - gailurra

+          private: Sarbide pribatua
+          bicycle_shop: Bizikleta-denda
+          bicycle_parking: Bizikleta-aparkalekua
+          toilets: Komunak

     richtext_area:
       edit: Aldatu
       preview: Aurrikusi
     richtext_area:
       edit: Aldatu
       preview: Aurrikusi

diff --git a/config/locales/he.yml b/config/locales/he.yml
index 70c83c17a04d9b37c88019976c923b945f6e4025..522eaaebc6d8dd3409e5fef0c22d6d56f222dc15 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -959,7 +959,7 @@ he:
     intro_2_create_account: נא ליצור חשבון משתמש
     partners_html: האירוח נתמך על־ידי מרכז %{ucl}‏, %{ic} ו%{bytemark}, ועל־ידי %{partners}
       אחרים.
     intro_2_create_account: נא ליצור חשבון משתמש
     partners_html: האירוח נתמך על־ידי מרכז %{ucl}‏, %{ic} ו%{bytemark}, ועל־ידי %{partners}
       אחרים.

-    partners_ucl: מרכז UCL VR
+    partners_ucl: UCL

     partners_ic: המכללה המלכותית של לונדון
     partners_bytemark: אירוח בייטמארק
     partners_partners: שותפים
     partners_ic: המכללה המלכותית של לונדון
     partners_bytemark: אירוח בייטמארק
     partners_partners: שותפים

diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 5780f8494a495b861aa327f94fe71c06034395ff..2864ba2f0c1050107255c8202a6307a115d23daf 100644 (file)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -21,8 +21,8 @@ hr:
   activerecord:
     models:
       acl: Kontrole pristupa
   activerecord:
     models:
       acl: Kontrole pristupa

-      changeset: Changeset
-      changeset_tag: Oznaka changeset-a
+      changeset: Set promjena
+      changeset_tag: Oznaka seta promjena

       country: Zemlja
       diary_comment: Komentar dnevnika
       diary_entry: Unos dnevnika
       country: Zemlja
       diary_comment: Komentar dnevnika
       diary_entry: Unos dnevnika


@@ -110,7 +110,7 @@ hr:
     edited_by_html: Korisnik %{user} je uredio <abbr title='%{title}'> prije %{time}</abbr>
     closed_by_html: Korisnik %{user} je zatvorio <abbr title='%{title}'> prije %{time}</abbr>
     version: Inačica
     edited_by_html: Korisnik %{user} je uredio <abbr title='%{title}'> prije %{time}</abbr>
     closed_by_html: Korisnik %{user} je zatvorio <abbr title='%{title}'> prije %{time}</abbr>
     version: Inačica

-    in_changeset: Changeset
+    in_changeset: Set promjena

     anonymous: anonimno
     no_comment: (bez komentara)
     part_of: Dio od
     anonymous: anonimno
     no_comment: (bez komentara)
     part_of: Dio od


@@ -119,7 +119,7 @@ hr:
     view_details: Prikaži detalje
     location: 'Lokacija:'
     changeset:
     view_details: Prikaži detalje
     location: 'Lokacija:'
     changeset:

-      title: 'Changeset: %{id}'
+      title: 'Set promjena: %{id}'

       belongs_to: Autor
       node: Točaka (%{count})
       node_paginated: Točke (%{x}-%{y} od %{count})
       belongs_to: Autor
       node: Točaka (%{count})
       node_paginated: Točke (%{x}-%{y} od %{count})


@@ -131,11 +131,11 @@ hr:
       hidden_commented_by: Komentar skriven od %{user} <abbr title="%{exact_time}">prije
         %{when}</abbr>
       commented_by: Komentirao/la %{user} <abbr title='%{exact_time}'>prije %{when}</abbr>
       hidden_commented_by: Komentar skriven od %{user} <abbr title="%{exact_time}">prije
         %{when}</abbr>
       commented_by: Komentirao/la %{user} <abbr title='%{exact_time}'>prije %{when}</abbr>

-      changesetxml: XLM Changeset
+      changesetxml: XLM Set promjena

       osmchangexml: osmChange XML
       feed:
       osmchangexml: osmChange XML
       feed:

-        title: Changeset %{id}
-        title_comment: Changeset %{id} - %{comment}
+        title: Set promjena %{id}
+        title_comment: Set promjena %{id} - %{comment}

       join_discussion: Prijavi se za uključivanje u raspravu
       discussion: Razgovor
     node:
       join_discussion: Prijavi se za uključivanje u raspravu
       discussion: Razgovor
     node:


@@ -167,7 +167,7 @@ hr:
         node: točka
         way: put
         relation: relacija
         node: točka
         way: put
         relation: relacija

-        changeset: changeset
+        changeset: set promjena

         note: bilješka
     timeout:
       sorry: Žao mi je, podaci za %{type} sa id %{id}, predugo se čekaju.
         note: bilješka
     timeout:
       sorry: Žao mi je, podaci za %{type} sa id %{id}, predugo se čekaju.


@@ -175,7 +175,7 @@ hr:
         node: točka
         way: put
         relation: relacija
         node: točka
         way: put
         relation: relacija

-        changeset: changeset
+        changeset: set promjena

         note: bilješka
     redacted:
       redaction: Redakcija %{id}
         note: bilješka
     redacted:
       redaction: Redakcija %{id}


@@ -230,7 +230,7 @@ hr:
     changeset:
       anonymous: Anonimno
       no_edits: (nema promjena)
     changeset:
       anonymous: Anonimno
       no_edits: (nema promjena)

-      view_changeset_details: Prikaži detalje changeseta
+      view_changeset_details: Prikaži detalje seta promjena

     changesets:
       id: ID
       saved_at: Spremljeno
     changesets:
       id: ID
       saved_at: Spremljeno


@@ -238,20 +238,20 @@ hr:
       comment: Komentar
       area: Područje
     list:
       comment: Komentar
       area: Područje
     list:

-      title: Changesets
-      title_user: Changesets od %{user}
+      title: Setovi promjena
+      title_user: Setovi promjena od %{user}

       title_friend: Paketi uređivanja tvojih prijatelja
       title_friend: Paketi uređivanja tvojih prijatelja

-      title_nearby: Paketi uređivanja obližnjih korisnika
+      title_nearby: Set promjena obližnjih korisnika

       empty: Nisu pronađeni paketi uređivanja.
       empty: Nisu pronađeni paketi uređivanja.

-      empty_area: Nema paketa uređivanja na ovom području.
+      empty_area: Nema setova promjena na ovom području.

       empty_user: Nema paketa uređivanja ovog korisnika.
       empty_user: Nema paketa uređivanja ovog korisnika.

-      no_more: Nema više traženih paketa uređivanja.
+      no_more: Nema više pronađenih setova promjena.

       no_more_area: Nema više paketa uređivanja na ovom području.
       no_more_area: Nema više paketa uređivanja na ovom području.

-      no_more_user: Nema više paketa uređivanja ovog korisnika.
+      no_more_user: Nema više setova promjena ovog korisnika.

       load_more: Učitaj više
     timeout:
       load_more: Učitaj više
     timeout:

-      sorry: Nažalost, popis Changeseta (skupa promjena) koje ste zatražili je predugo
-        trajalo za preuzimanje.
+      sorry: Nažalost, popis setova promjena koje ste zatražili je predugo trajalo
+        za preuzimanje.

     rss:
       title_all: Rasprava o OpenStreetMap setu promjena
       title_particular: 'Rasprava o OpenStreetMap setu promjena #%{changeset_id}'
     rss:
       title_all: Rasprava o OpenStreetMap setu promjena
       title_particular: 'Rasprava o OpenStreetMap setu promjena #%{changeset_id}'


@@ -351,8 +351,8 @@ hr:
       too_large:
         advice: 'Ako gornji izvoz podataka ne uspije, molim pokušaj sa nekim od izvora
           navedenih ispod:'
       too_large:
         advice: 'Ako gornji izvoz podataka ne uspije, molim pokušaj sa nekim od izvora
           navedenih ispod:'

-        body: Ovo područje je preveliko da bi se izvezlo kao OpenStreetMap XML podaci.
-          Molim povećaj prikaz ili odaberi manju površinu ili odaberi jedan od izvora
+        body: Ovo područje je preveliko da bi se izvezlo u OpenStreetMap XML formatu.
+          Molim približi prikaz ili odaberi manje područje ili odaberi jedan od izvora

           navedenih ispod za preuzimanje velike količine podataka.
         planet:
           title: PlanetOSM
           navedenih ispod za preuzimanje velike količine podataka.
         planet:
           title: PlanetOSM


@@ -376,7 +376,7 @@ hr:
       scale: Mjerilo
       max: max
       image_size: Veličina slike
       scale: Mjerilo
       max: max
       image_size: Veličina slike

-      zoom: Zoom
+      zoom: Približenje

       add_marker: Dodaj marker na kartu
       latitude: 'Lat:'
       longitude: 'Lon:'
       add_marker: Dodaj marker na kartu
       latitude: 'Lat:'
       longitude: 'Lon:'


@@ -1893,8 +1893,8 @@ hr:
       tooltip_disabled: Legenda karte je dostupna samo za standardni sloj
     map:
       zoom:
       tooltip_disabled: Legenda karte je dostupna samo za standardni sloj
     map:
       zoom:

-        in: Povećaj prikaz
-        out: Smanji prikaz
+        in: Približi
+        out: Udalji

       locate:
         title: Pokaži moju lokaciju
         popup: Udaljen/a si {distance} {unit} od ove točke
       locate:
         title: Pokaži moju lokaciju
         popup: Udaljen/a si {distance} {unit} od ove točke


@@ -1913,11 +1913,12 @@ hr:
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Doniraj OSM projektu</a>
     site:
       edit_tooltip: Uredi kartu
       donate_link_text: <a class='donate-attr' href='%{donate_url}'>Doniraj OSM projektu</a>
     site:
       edit_tooltip: Uredi kartu

-      edit_disabled_tooltip: Uvećajte za uređivanje karte
+      edit_disabled_tooltip: Približi za uređivanje karte

       createnote_tooltip: Dodaj bilješku na kartu
       createnote_tooltip: Dodaj bilješku na kartu

-      createnote_disabled_tooltip: Povećaj prikaz za dodavanje bilješke na kartu
-      map_notes_zoom_in_tooltip: Povećaj prikaz da vidiš napomene na karti
-      map_data_zoom_in_tooltip: Povećaj prikaz da vidiš podatke karte
+      createnote_disabled_tooltip: Približi za dodavanje bilješke na kartu
+      map_notes_zoom_in_tooltip: Približi da vidiš napomene na karti
+      map_data_zoom_in_tooltip: Približi da vidiš podatke karte
+      queryfeature_disabled_tooltip: Približi za provjeru elemenata

     notes:
       new:
         intro: Primjetili ste grešku ili nedostatak nečega? Javite ostalim kartografima
     notes:
       new:
         intro: Primjetili ste grešku ili nedostatak nečega? Javite ostalim kartografima


@@ -1933,7 +1934,7 @@ hr:
         reactivate: Reaktiviraj
         comment_and_resolve: Komentiraj i razriješi
         comment: Komentiraj
         reactivate: Reaktiviraj
         comment_and_resolve: Komentiraj i razriješi
         comment: Komentiraj

-    edit_help: Pomakni kartu i povećaj prikaz koji želiš urediti, zatim klikni ovdje.
+    edit_help: Pomakni kartu i približi dio koji želiš urediti, zatim klikni ovdje.

   redaction:
     edit:
       description: Opis
   redaction:
     edit:
       description: Opis

diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 8510a3c454d7e955c5d1d87f732c49235fde6c25..70473813ebe5cc5d9534ff4453df735942633f3e 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -669,6 +669,7 @@ ro:
           locality: Localitate
           moor: Baltă
           municipality: Comună
           locality: Localitate
           moor: Baltă
           municipality: Comună

+          neighbourhood: Cartier

           postcode: Cod poștal
           region: Regiune
           sea: Mare
           postcode: Cod poștal
           region: Regiune
           sea: Mare


@@ -756,6 +757,8 @@ ro:
           museum: Muzeu
           theme_park: Parc tematic
           zoo: Gradină zoologică
           museum: Muzeu
           theme_park: Parc tematic
           zoo: Gradină zoologică

+        tunnel:
+          "yes": Tunel

         waterway:
           canal: Canal
           dam: Baraj
         waterway:
           canal: Canal
           dam: Baraj


@@ -795,6 +798,7 @@ ro:
     user_diaries: Jurnalele utilizatorilor
     edit_with: Modificare cu %{editor}
     intro_header: Bine ați venit la OpenStreetMap!
     user_diaries: Jurnalele utilizatorilor
     edit_with: Modificare cu %{editor}
     intro_header: Bine ați venit la OpenStreetMap!

+    intro_2_create_account: Creează un cont de utilizator

     partners_partners: parteneri
     help: Ajutor
     about: Despre
     partners_partners: parteneri
     help: Ajutor
     about: Despre


@@ -814,31 +818,51 @@ ro:
       title: Despre această traducere
     native:
       title: Despre această pagină
       title: Despre această traducere
     native:
       title: Despre această pagină

+      mapping_link: Începeți să cartografiați

     legal_babble:
       title_html: Drepturi de autor și licență
     legal_babble:
       title_html: Drepturi de autor și licență

+      contributors_title_html: Contribuitorii noștri

       infringement_title_html: Încălcarea drepturilor de autor
       trademarks_title_html: <span id="trademarks"></span>Mărci înregistrate
   welcome_page:
     title: Bun venit!
       infringement_title_html: Încălcarea drepturilor de autor
       trademarks_title_html: <span id="trademarks"></span>Mărci înregistrate
   welcome_page:
     title: Bun venit!

+    basic_terms:
+      editor_html: Un <strong>editor</strong> este un program sau website pe care
+        îl puteți utiliza pentru a edita harta.

     rules:
       title: Reguli
     questions:
       title: Întrebări?
     start_mapping: Începeți să cartografiați
     rules:
       title: Reguli
     questions:
       title: Întrebări?
     start_mapping: Începeți să cartografiați

+    add_a_note:
+      title: <h3>Nu aveți timp pentru editare? Adaugați o notiță<h3>

   fixthemap:
     how_to_help:
   fixthemap:
     how_to_help:

+      title: <h3>Cum poți ajuta<h3>

       join_the_community:
         title: Alăturați-vă comunității
   help_page:
     welcome:
       join_the_community:
         title: Alăturați-vă comunității
   help_page:
     welcome:

+      url: Bun venit

       title: Bine ați venit la OSM
     beginners_guide:
       url: http://wiki.openstreetmap.org/wiki/Ro:Beginners%27_guide
       title: Bine ați venit la OSM
     beginners_guide:
       url: http://wiki.openstreetmap.org/wiki/Ro:Beginners%27_guide

+      title: Ghidul începătorilor
+    help:
+      url: https://help.openstreetmap.org/
+      title: help.openstreetmap.org
+  about_page:
+    next: Înainte
+    partners_title: Parteneri

   notifier:
     message_notification:
       hi: Salut, %{to_user},
   notifier:
     message_notification:
       hi: Salut, %{to_user},

+    friend_notification:
+      hi: Salut %{to_user},

     gpx_notification:
       greeting: Salut,
     gpx_notification:
       greeting: Salut,

+    email_confirm_plain:
+      greeting: Salut,

     email_confirm_html:
       greeting: Salut,
     lost_password_plain:
     email_confirm_html:
       greeting: Salut,
     lost_password_plain:


@@ -861,6 +885,7 @@ ro:
     message_summary:
       delete_button: Şterge
     new:
     message_summary:
       delete_button: Şterge
     new:

+      title: Trimite mesajul

       subject: Subiect
       send_button: Trimite
       back_to_inbox: Înapoi la mesaje primite
       subject: Subiect
       send_button: Trimite
       back_to_inbox: Înapoi la mesaje primite


@@ -900,6 +925,7 @@ ro:
       close: Închide
     search:
       search: Căutare
       close: Închide
     search:
       search: Căutare

+      get_directions: Indicații de orientare

       from: De la
       to: Către
       where_am_i: Unde sunt eu?
       from: De la
       to: Către
       where_am_i: Unde sunt eu?


@@ -907,10 +933,13 @@ ro:
     key:
       table:
         entry:
     key:
       table:
         entry:

+          rail: Cale ferată
+          subway: Stație de metrou

           tram:
             1: tramvai
           apron:
             1: terminal
           tram:
             1: tramvai
           apron:
             1: terminal

+          park: Parc

     markdown_help:
       title_html: Parsat cu <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
   trace:
     markdown_help:
       title_html: Parsat cu <a href="http://daringfireball.net/projects/markdown/">Markdown</a>
   trace:


@@ -958,6 +987,19 @@ ro:
     new:
       password: 'Parolă:'
       confirm password: 'Confirmați parola:'
     new:
       password: 'Parolă:'
       confirm password: 'Confirmați parola:'

+    view:
+      my messages: Mesajele mele
+      my profile: Profilul meu
+      my settings: Setările mele
+      my comments: Comentariile mele
+    account:
+      my settings: Setările mele
+      preferred editor: 'Editor preferat:'
+  user_block:
+    partial:
+      show: Arată
+    show:
+      show: Arată

   javascripts:
     share:
       title: Distribuie
   javascripts:
     share:
       title: Distribuie


@@ -969,4 +1011,6 @@ ro:
         title: Arată locația mea
     site:
       edit_disabled_tooltip: Măriți pentru a edita harta
         title: Arată locația mea
     site:
       edit_disabled_tooltip: Măriți pentru a edita harta

+    context:
+      show_address: Arată adresa

 ...
 ...

diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 86f78517d8f3078b86a8d7076d5aec7cf7387fb5..946bbd92926f6b1ac22314aa26cf50ca9b9d50fb 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -384,8 +384,7 @@ ru:
         title: Дневниковые записи OpenStreetMap
         description: Последнее дневниковые записи пользователей OpenStreetMap
     comments:
         title: Дневниковые записи OpenStreetMap
         description: Последнее дневниковые записи пользователей OpenStreetMap
     comments:

-      has_commented_on: '%{display_name} только что прокомментировал следующие записи
-        дневника'
+      has_commented_on: '%{display_name} прокомментировал следующие записи дневника'

       post: Сообщение
       when: Когда
       comment: Комментарий
       post: Сообщение
       when: Когда
       comment: Комментарий


@@ -1264,9 +1263,9 @@ ru:
       их для любых целей до тех пор, пока вы указываете авторские права OpenStreetMap
       и его участников. Если вы изменяете данные или определенным образом основываетесь
       на них, вы можете распространять свой результат только под той же лицензией.
       их для любых целей до тех пор, пока вы указываете авторские права OpenStreetMap
       и его участников. Если вы изменяете данные или определенным образом основываетесь
       на них, вы можете распространять свой результат только под той же лицензией.

-      СмоÑ\82Ñ\80иÑ\82е <a href=''%{copyright_path}''>Ð\90вÑ\82оÑ\80Ñ\81кие пÑ\80ава и СÑ\82Ñ\80аниÑ\86а лиÑ\86ензии</a>
+      СмоÑ\82Ñ\80иÑ\82е <a href=''%{copyright_path}''>Ð\90вÑ\82оÑ\80Ñ\81кие пÑ\80ава и лиÑ\86ензиÑ\80ование</a>

       для более подробной информации.'
       для более подробной информации.'

-    legal_title: ЮÑ\80идиÑ\87еÑ\81кий
+    legal_title: ЮÑ\80идиÑ\87еÑ\81кие вопÑ\80оÑ\81Ñ\8b

     legal_html: Этот веб-сайт и многие связанные с ними услуги находятся в ведении
       <a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF), действующего
       от имени сообщества OSM. Использование предоставляемых OSMF услуг является предметом
     legal_html: Этот веб-сайт и многие связанные с ними услуги находятся в ведении
       <a href='http://osmfoundation.org/'>OpenStreetMap Foundation</a> (OSMF), действующего
       от имени сообщества OSM. Использование предоставляемых OSMF услуг является предметом


@@ -2453,27 +2452,27 @@ ru:
         mapzen_foot: Пешком (Mapzen)
       descend: По убыванию
       directions: Маршрут
         mapzen_foot: Пешком (Mapzen)
       descend: По убыванию
       directions: Маршрут

-      distance: Ð\94лина пÑ\83Ñ\82и
+      distance: РаÑ\81Ñ\81Ñ\82оÑ\8fние

       errors:
         no_route: Не удалось найти маршрут между этими двумя точками.
         no_place: К сожалению, данное место не найдено.
       instructions:
         continue_without_exit: Продолжите по %{name}
         slight_right_without_exit: Плавно поверните направо на %{name}
       errors:
         no_route: Не удалось найти маршрут между этими двумя точками.
         no_place: К сожалению, данное место не найдено.
       instructions:
         continue_without_exit: Продолжите по %{name}
         slight_right_without_exit: Плавно поверните направо на %{name}

-        offramp_right_without_exit: Ð\98Ñ\81полÑ\8cзÑ\83йÑ\82е Ñ\81Ñ\8aезд впÑ\80аво на %{name}
-        onramp_right_without_exit: Поверните направо на съезде на %{name}
+        offramp_right_without_exit: СвеÑ\80ниÑ\82е напÑ\80аво на Ñ\81Ñ\8aезд к %{name}
+        onramp_right_without_exit: Поверните направо на съезд к %{name}

         endofroad_right_without_exit: В конце дороги поверните направо на %{name}
         endofroad_right_without_exit: В конце дороги поверните направо на %{name}

-        merge_right_without_exit: Ð\9fеÑ\80еÑ\81Ñ\82Ñ\80ойÑ\82еÑ\81Ñ\8c напÑ\80аво на %{name}
+        merge_right_without_exit: Ð\9fеÑ\80еÑ\81Ñ\82Ñ\80ойÑ\82еÑ\81Ñ\8c пÑ\80авее на %{name}

         fork_right_without_exit: На развилке поверните направо на %{name}
         turn_right_without_exit: Поверните направо на %{name}
         sharp_right_without_exit: Резко поверните направо на %{name}
         uturn_without_exit: Развернитесь на %{name}
         sharp_left_without_exit: Резко поверните налево на %{name}
         turn_left_without_exit: Поверните налево на %{name}
         fork_right_without_exit: На развилке поверните направо на %{name}
         turn_right_without_exit: Поверните направо на %{name}
         sharp_right_without_exit: Резко поверните направо на %{name}
         uturn_without_exit: Развернитесь на %{name}
         sharp_left_without_exit: Резко поверните налево на %{name}
         turn_left_without_exit: Поверните налево на %{name}

-        offramp_left_without_exit: Ð\98Ñ\81полÑ\8cзÑ\83йÑ\82е Ñ\81Ñ\8aезд влево на %{name}
-        onramp_left_without_exit: Поверните налево на съезде на %{name}
+        offramp_left_without_exit: СвеÑ\80ниÑ\82е налево на Ñ\81Ñ\8aезд к %{name}
+        onramp_left_without_exit: Поверните налево на съезд к %{name}

         endofroad_left_without_exit: В конце дороги поверните налево на %{name}
         endofroad_left_without_exit: В конце дороги поверните налево на %{name}

-        merge_left_without_exit: Ð\9fеÑ\80еÑ\81Ñ\82Ñ\80ойÑ\82еÑ\81Ñ\8c налево на %{name}
+        merge_left_without_exit: Ð\9fеÑ\80еÑ\81Ñ\82Ñ\80ойÑ\82еÑ\81Ñ\8c левее на %{name}

         fork_left_without_exit: На развилке поверните налево на %{name}
         slight_left_without_exit: Плавно поверните налево на %{name}
         via_point_without_exit: (через точку)
         fork_left_without_exit: На развилке поверните налево на %{name}
         slight_left_without_exit: Плавно поверните налево на %{name}
         via_point_without_exit: (через точку)

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index ea7de5c750e36388b552bb91b6a52f288c6f8681..9344e6eb5912d56f550ae4e11338d00dccbacd8e 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -15,6 +15,7 @@
 # Author: Liuxinyu970226
 # Author: Mikepanhu
 # Author: Mmyangfl
 # Author: Liuxinyu970226
 # Author: Mikepanhu
 # Author: Mmyangfl

+# Author: Mstar

 # Author: Mywood
 # Author: Orinx
 # Author: Pesder
 # Author: Mywood
 # Author: Orinx
 # Author: Pesder


@@ -118,14 +119,14 @@ zh-TW:
       name: 遠端控制
       description: 遠端控制 (JOSM 或 Merkaartor)
   browse:
       name: 遠端控制
       description: 遠端控制 (JOSM 或 Merkaartor)
   browse:

-    created: 已建ç«\8bæ\96¼
-    closed: 已關閉於
-    created_html: 已於 <abbr title='%{title}'>%{time} 前</abbr>建立
-    closed_html: 已於 <abbr title='%{title}'>%{time} 前</abbr>關閉
-    created_by_html: 已於 <abbr title='%{title}'>%{time} 前</abbr>由 %{user} 建立
-    deleted_by_html: 已於 <abbr title='%{title}'>%{time} 前</abbr>由 %{user} 刪除
-    edited_by_html: 已於 <abbr title='%{title}'>%{time} 前</abbr>由 %{user} 編輯
-    closed_by_html: 已於 <abbr title='%{title}'>%{time} 前</abbr>由 %{user} 關閉
+    created: 建立於
+    closed: 關閉於
+    created_html: 於 <abbr title='%{title}'>%{time} 前</abbr>建立
+    closed_html: 於 <abbr title='%{title}'>%{time} 前</abbr>關閉
+    created_by_html: 於 <abbr title='%{title}'>%{time} 前</abbr>由 %{user} 建立
+    deleted_by_html: 於 <abbr title='%{title}'>%{time} 前</abbr>由 %{user} 刪除
+    edited_by_html: 於 <abbr title='%{title}'>%{time} 前</abbr>由 %{user} 編輯
+    closed_by_html: 於 <abbr title='%{title}'>%{time} 前</abbr>由 %{user} 關閉

     version: 版本
     in_changeset: 變更集
     anonymous: 匿名
     version: 版本
     in_changeset: 變更集
     anonymous: 匿名


@@ -152,7 +153,7 @@ zh-TW:
       feed:
         title: 變更集 %{id}
         title_comment: 變更集 %{id} - %{comment}
       feed:
         title: 變更集 %{id}
         title_comment: 變更集 %{id} - %{comment}

-      join_discussion: ç\99»å\85¥ä»¥å\8a å\85¥討論
+      join_discussion: ç\99»å\85¥ä»¥å\8f\83å\8a 討論

       discussion: 討論
     node:
       title: 節點：%{name}
       discussion: 討論
     node:
       title: 節點：%{name}


@@ -219,15 +220,15 @@ zh-TW:
       open_title: 未解決的註記：#%{note_name}
       closed_title: 已解決的註記：#%{note_name}
       hidden_title: 已隱藏的註記：#%{note_name}
       open_title: 未解決的註記：#%{note_name}
       closed_title: 已解決的註記：#%{note_name}
       hidden_title: 已隱藏的註記：#%{note_name}

-      open_by: 已於 <abbr title='%{exact_time}'>%{when} 前</abbr>由 %{user} 建立
-      open_by_anonymous: 已於 <abbr title='%{exact_time}'>%{when} 前</abbr>由匿名使用者建立
+      open_by: 於 <abbr title='%{exact_time}'>%{when} 前</abbr>由 %{user} 建立
+      open_by_anonymous: 於 <abbr title='%{exact_time}'>%{when} 前</abbr>由匿名使用者建立

       commented_by: '%{user} 於 <abbr title=''%{exact_time}''>%{when} 前</abbr>的評論'
       commented_by_anonymous: 匿名使用者於 <abbr title='%{exact_time}'>%{when} 前</abbr>的評論
       commented_by: '%{user} 於 <abbr title=''%{exact_time}''>%{when} 前</abbr>的評論'
       commented_by_anonymous: 匿名使用者於 <abbr title='%{exact_time}'>%{when} 前</abbr>的評論

-      closed_by: 已於 <abbr title='%{exact_time}'>%{when} 前</abbr>由 %{user} 解決
-      closed_by_anonymous: 已於 <abbr title='%{exact_time}'>%{when} 前</abbr>由匿名使用者解決
-      reopened_by: 已於 <abbr title='%{exact_time}'>%{when} 前</abbr>由 %{user} 重新開啟
-      reopened_by_anonymous: 已於 <abbr title='%{exact_time}'>%{when} 前</abbr>由匿名使用者重新開啟
-      hidden_by: 已於 <abbr title='%{exact_time}'>%{when} 前</abbr>由 %{user} 隱藏
+      closed_by: 於 <abbr title='%{exact_time}'>%{when} 前</abbr>由 %{user} 解決
+      closed_by_anonymous: 於 <abbr title='%{exact_time}'>%{when} 前</abbr>由匿名使用者解決
+      reopened_by: 於 <abbr title='%{exact_time}'>%{when} 前</abbr>由 %{user} 重新開啟
+      reopened_by_anonymous: 於 <abbr title='%{exact_time}'>%{when} 前</abbr>由匿名使用者重新開啟
+      hidden_by: 於 <abbr title='%{exact_time}'>%{when} 前</abbr>由 %{user} 隱藏

     query:
       title: 查詢圖徵
       introduction: 點選地圖以尋找附近的圖徵
     query:
       title: 查詢圖徵
       introduction: 點選地圖以尋找附近的圖徵


@@ -266,8 +267,8 @@ zh-TW:
       title_all: OpenStreetMap 變更集討論
       title_particular: OpenStreetMap 變更集 %{changeset_id} 討論
       comment: '%{author} 對變更集 #%{changeset_id} 發表新評論'
       title_all: OpenStreetMap 變更集討論
       title_particular: OpenStreetMap 變更集 %{changeset_id} 討論
       comment: '%{author} 對變更集 #%{changeset_id} 發表新評論'

-      commented_at_html: 已於 %{when} 前更新
-      commented_at_by_html: 已於 %{when} 前由 %{user} 更新
+      commented_at_html: 於 %{when} 前更新
+      commented_at_by_html: 於 %{when} 前由 %{user} 更新

       full: 完整討論
   diary_entry:
     new:
       full: 完整討論
   diary_entry:
     new:


@@ -379,7 +380,7 @@ zh-TW:
       scale: 比例
       max: 最大
       image_size: 圖片大小
       scale: 比例
       max: 最大
       image_size: 圖片大小

-      zoom: 變焦
+      zoom: 縮放

       add_marker: 在地圖加上標記
       latitude: 緯度：
       longitude: 經度：
       add_marker: 在地圖加上標記
       latitude: 緯度：
       longitude: 經度：


@@ -402,10 +403,10 @@ zh-TW:
     search_osm_nominatim:
       prefix:
         aerialway:
     search_osm_nominatim:
       prefix:
         aerialway:

-          cable_car: 纜車
-          chair_lift: 登山吊椅
+          cable_car: 大型纜車
+          chair_lift: 升降吊椅

           drag_lift: 上山牽引梯
           drag_lift: 上山牽引梯

-          gondola: 空中纜車
+          gondola: 小型纜車

           station: 空中纜車車站
         aeroway:
           aerodrome: 機場
           station: 空中纜車車站
         aeroway:
           aerodrome: 機場


@@ -418,21 +419,21 @@ zh-TW:
         amenity:
           animal_shelter: 動物收容所
           arts_centre: 藝術中心
         amenity:
           animal_shelter: 動物收容所
           arts_centre: 藝術中心

-          atm: ATM
+          atm: 提款機

           bank: 銀行
           bar: 酒吧
           bank: 銀行
           bar: 酒吧

-          bbq: ç\87\92ç\83¤場
+          bbq: ç\83¤è\82\89場

           bench: 長椅
           bench: 長椅

-          bicycle_parking: 單車停車
-          bicycle_rental: 自行車租賃
-          biergarten: 啤酒花園
-          boat_rental: 租船
+          bicycle_parking: 自行車停車場
+          bicycle_rental: 自行車出租
+          biergarten: 啤酒庭園
+          boat_rental: 船隻出租

           brothel: 妓院
           bureau_de_change: 找換店
           brothel: 妓院
           bureau_de_change: 找換店

-          bus_station: 客é\81\8b站
+          bus_station: 巴士站

           cafe: 咖啡廳
           cafe: 咖啡廳

-          car_rental: 租車
-          car_sharing: 汽車共用
+          car_rental: 汽車出租
+          car_sharing: 汽車共乘

           car_wash: 洗車
           casino: 賭場
           charging_station: 充電站
           car_wash: 洗車
           casino: 賭場
           charging_station: 充電站


@@ -441,26 +442,26 @@ zh-TW:
           clinic: 診所
           clock: 時鐘
           college: 學院
           clinic: 診所
           clock: 時鐘
           college: 學院

-          community_centre: 社群中心
+          community_centre: 社區中心

           courthouse: 法院
           crematorium: 火葬場
           dentist: 牙醫
           courthouse: 法院
           crematorium: 火葬場
           dentist: 牙醫

-          doctors: 醫生
+          doctors: 醫師

           dormitory: 宿舍
           drinking_water: 飲用水
           dormitory: 宿舍
           drinking_water: 飲用水

-          driving_school: 駕駛學校
+          driving_school: 駕訓班

           embassy: 大使館
           emergency_phone: 緊急電話
           embassy: 大使館
           emergency_phone: 緊急電話

-          fast_food: 快餐
+          fast_food: 速食

           ferry_terminal: 渡輪碼頭
           fire_hydrant: 消防栓
           ferry_terminal: 渡輪碼頭
           fire_hydrant: 消防栓

-          fire_station: 消防局
+          fire_station: 消防隊

           food_court: 美食廣場
           fountain: 噴泉
           food_court: 美食廣場
           fountain: 噴泉

-          fuel: 油店
+          fuel: 燃料

           gambling: 賭場
           gambling: 賭場

-          grave_yard: å¢\93å\9c°
-          gym: 健身中心 / 健身房
+          grave_yard: å¢\93å\9c\92
+          gym: 瘦身中心 / 健身房

           health_centre: 健康中心
           hospital: 醫院
           hunting_stand: 狩獵站
           health_centre: 健康中心
           hospital: 醫院
           hunting_stand: 狩獵站


@@ -480,19 +481,19 @@ zh-TW:
           pharmacy: 藥房
           place_of_worship: 宗教場所
           police: 警察
           pharmacy: 藥房
           place_of_worship: 宗教場所
           police: 警察

-          post_box: 郵件
+          post_box: 郵筒

           post_office: 郵局
           preschool: 學前教育
           prison: 監獄
           post_office: 郵局
           preschool: 學前教育
           prison: 監獄

-          pub: 酒吧
+          pub: 酒館

           public_building: 公共建築
           reception_area: 接待區
           recycling: 回收點
           restaurant: 餐廳
           public_building: 公共建築
           reception_area: 接待區
           recycling: 回收點
           restaurant: 餐廳

-          retirement_home: 安老院
-          sauna: 桑拿
+          retirement_home: 養老院
+          sauna: 三溫暖

           school: 學校
           school: 學校

-          shelter: 庇護所
+          shelter: 涼亭

           shop: 商店
           shower: 淋浴
           social_centre: 社交中心
           shop: 商店
           shower: 淋浴
           social_centre: 社交中心


@@ -500,26 +501,26 @@ zh-TW:
           social_facility: 社會福利設施
           studio: 錄音室
           swimming_pool: 游泳池
           social_facility: 社會福利設施
           studio: 錄音室
           swimming_pool: 游泳池

-          taxi: 出租車
+          taxi: 計程車

           telephone: 公共電話
           theatre: 劇院
           telephone: 公共電話
           theatre: 劇院

-          toilets: 洗手間
-          townhall: 市政廳
+          toilets: 廁所
+          townhall: 鄉鎮市區公所

           university: 大學
           vending_machine: 自動販賣機
           veterinary: 獸醫
           university: 大學
           vending_machine: 自動販賣機
           veterinary: 獸醫

-          village_hall: 村公所
+          village_hall: 村里辦公室

           waste_basket: 垃圾桶
           waste_basket: 垃圾桶

-          waste_disposal: 廢æ£\84ç\89©è\99\95ç\90\86
-          youth_centre: é\9d\92å°\91年中å¿\83
+          waste_disposal: å\9e\83å\9c¾å­\90è»\8a
+          youth_centre: 青年中心

         boundary:
           administrative: 行政區邊界
           census: 人口普查邊界
           national_park: 國家公園
           protected_area: 保護區
         bridge:
         boundary:
           administrative: 行政區邊界
           census: 人口普查邊界
           national_park: 國家公園
           protected_area: 保護區
         bridge:

-          aqueduct: 水道
-          suspension: 懸索橋
+          aqueduct: 高架水道
+          suspension: 吊橋

           swing: 平旋橋
           viaduct: 高架橋
           "yes": 橋
           swing: 平旋橋
           viaduct: 高架橋
           "yes": 橋


@@ -547,47 +548,47 @@ zh-TW:
           bus_guideway: 軌道巴士線
           bus_stop: 巴士站
           construction: 建造中道路
           bus_guideway: 軌道巴士線
           bus_stop: 巴士站
           construction: 建造中道路

-          cycleway: 單車徑
+          cycleway: 自行車道

           elevator: 電梯
           elevator: 電梯

-          emergency_access_point: 緊急求助點
-          footway: 行人路
-          ford: 淺灘
-          living_street: 生活街
-          milestone: 里程碑
+          emergency_access_point: 緊急聯絡點
+          footway: 步道
+          ford: 過水點
+          living_street: 生活街道
+          milestone: 里程標

           motorway: 高速公路
           motorway_junction: 高速公路交匯處
           motorway: 高速公路
           motorway_junction: 高速公路交匯處

-          motorway_link: 高速公路連接路
+          motorway_link: 高速公路聯絡道

           path: 小徑
           pedestrian: 人行道
           path: 小徑
           pedestrian: 人行道

-          platform: 車站月台
-          primary: 一級道路
+          platform: 月台
+          primary: 省道

           primary_link: 主要道路
           proposed: 計畫道路
           raceway: 賽道
           residential: 住宅區道路
           rest_area: 休息區
           road: 道路
           primary_link: 主要道路
           proposed: 計畫道路
           raceway: 賽道
           residential: 住宅區道路
           rest_area: 休息區
           road: 道路

-          secondary: 二級道路
+          secondary: 縣道

           secondary_link: 次級道路連接路
           service: 服務道路
           services: 高速公路休息區
           speed_camera: 測速照相機
           steps: 階梯
           street_lamp: 路燈
           secondary_link: 次級道路連接路
           service: 服務道路
           services: 高速公路休息區
           speed_camera: 測速照相機
           steps: 階梯
           street_lamp: 路燈

-          tertiary: 三級道路
+          tertiary: 鄉道

           tertiary_link: 三級道路連接路
           tertiary_link: 三級道路連接路

-          track: 軌道
+          track: 產業道路

           traffic_signals: 交通號誌
           traffic_signals: 交通號誌

-          trail: 小徑
-          trunk: 主要幹道
+          trail: 步徑
+          trunk: 快速道路

           trunk_link: 主要幹道連接路
           unclassified: 無分級道路
           trunk_link: 主要幹道連接路
           unclassified: 無分級道路

-          unsurfaced: 未平整道路
+          unsurfaced: 未鋪設道路

           "yes": 道路
         historic:
           archaeological_site: 考古遺址
           battlefield: 戰場
           "yes": 道路
         historic:
           archaeological_site: 考古遺址
           battlefield: 戰場

-          boundary_stone: ç\95\8cç¢\91
+          boundary_stone: ç\95\8cç\9f³

           building: 歷史建物
           bunker: 掩體
           castle: 城堡
           building: 歷史建物
           bunker: 掩體
           castle: 城堡


@@ -604,7 +605,7 @@ zh-TW:
           monument: 古蹟
           roman_road: 羅馬道路
           ruins: 廢墟
           monument: 古蹟
           roman_road: 羅馬道路
           ruins: 廢墟

-          stone: ç\9f³é ­
+          stone: ç\9f³é\80 å\8f²è¹\9f

           tomb: 墳墓
           tower: 塔
           wayside_cross: 路邊十字架
           tomb: 墳墓
           tower: 塔
           wayside_cross: 路邊十字架


@@ -613,65 +614,65 @@ zh-TW:
         junction:
           "yes": 路口
         landuse:
         junction:
           "yes": 路口
         landuse:

-          allotments: 小園地
-          basin: 盆地
-          brownfield: 棕地
-          cemetery: å¢\93å\9c\92
+          allotments: 社區農園
+          basin: 凹地
+          brownfield: 低污染再利用地
+          cemetery: å\85¬å¢\93

           commercial: 商業區
           conservation: 保育區
           construction: 建設中區域
           commercial: 商業區
           conservation: 保育區
           construction: 建設中區域

-          farm: 農場
+          farm: 農田

           farmland: 農地
           farmyard: 農家
           farmland: 農地
           farmyard: 農家

-          forest: 森林
+          forest: 管理林

           garages: 車庫
           garages: 車庫

-          grass: 草地
-          greenfield: ç¶ 地
+          grass: 平整草地
+          greenfield: 空地

           industrial: 工業區
           industrial: 工業區

-          landfill: 垃圾埋填區
-          meadow: 草地
+          landfill: 垃圾掩埋場
+          meadow: 野草地

           military: 軍事區
           mine: 礦場
           orchard: 果園
           military: 軍事區
           mine: 礦場
           orchard: 果園

-          quarry: 採石場
+          quarry: 露天礦場

           railway: 鐵路
           recreation_ground: 遊樂場
           reservoir: 水庫
           reservoir_watershed: 水庫集水區
           residential: 住宅區
           railway: 鐵路
           recreation_ground: 遊樂場
           reservoir: 水庫
           reservoir_watershed: 水庫集水區
           residential: 住宅區

-          retail: 零售
+          retail: 店面

           road: 道路用地
           road: 道路用地

-          village_green: 鄉村草地
+          village_green: 社區草地

           vineyard: 葡萄園
           "yes": 土地利用
         leisure:
           vineyard: 葡萄園
           "yes": 土地利用
         leisure:

-          beach_resort: 海灘度假村
-          bird_hide: 鳥類觀察站
+          beach_resort: 海灘遊樂區
+          bird_hide: 賞鳥亭

           club: 俱樂部
           common: 公共用地
           dog_park: 狗狗公園
           fishing: 垂釣區
           club: 俱樂部
           common: 公共用地
           dog_park: 狗狗公園
           fishing: 垂釣區

-          fitness_centre: 健身房
+          fitness_centre: 瘦身中心

           fitness_station: 健身站
           garden: 花園
           golf_course: 高爾夫球道
           fitness_station: 健身站
           garden: 花園
           golf_course: 高爾夫球道

-          horse_riding: é¨\8e馬
+          horse_riding: é¦¬å ´

           ice_rink: 溜冰場
           marina: 小船塢
           miniature_golf: 小型高爾夫球場
           nature_reserve: 自然保護區
           park: 公園
           ice_rink: 溜冰場
           marina: 小船塢
           miniature_golf: 小型高爾夫球場
           nature_reserve: 自然保護區
           park: 公園

-          pitch: 運動場地
-          playground: é\81\8aæ¨\82å ´
+          pitch: 運動場
+          playground: é\81\8aæ¨\82å\8d\80

           recreation_ground: 遊樂場
           resort: 度假村
           recreation_ground: 遊樂場
           resort: 度假村

-          sauna: 桑拿
+          sauna: 三溫暖

           slipway: 船臺
           slipway: 船臺

-          sports_centre: é«\94è\82²中心
+          sports_centre: é\81\8bå\8b\95中心

           stadium: 體育館
           swimming_pool: 游泳池
           track: 跑道
           stadium: 體育館
           swimming_pool: 游泳池
           track: 跑道

-          water_park: 水上公園
+          water_park: 水上樂園

           "yes": 休閒
         man_made:
           lighthouse: 燈塔
           "yes": 休閒
         man_made:
           lighthouse: 燈塔


@@ -684,68 +685,68 @@ zh-TW:
           barracks: 軍營
           bunker: 掩體
         mountain_pass:
           barracks: 軍營
           bunker: 掩體
         mountain_pass:

-          "yes": å±±口
+          "yes": å\9f¡口

         natural:
           bay: 灣
           beach: 海灘
           cape: 海角
           cave_entrance: 洞穴入口
         natural:
           bay: 灣
           beach: 海灘
           cape: 海角
           cave_entrance: 洞穴入口

-          cliff: 峭壁
+          cliff: 懸崖

           crater: 火山口
           dune: 沙丘
           fell: 高原荒地
           fjord: 峽灣
           crater: 火山口
           dune: 沙丘
           fell: 高原荒地
           fjord: 峽灣

-          forest: 森林
+          forest: 管理林

           geyser: 間歇泉
           geyser: 間歇泉

-          glacier: 冰川
-          grassland: 草地
-          heath: 石南樹叢
+          glacier: 冰河
+          grassland: 雜草地
+          heath: 石楠荒地

           hill: 小山
           hill: 小山

-          island: 島
+          island: 島嶼

           land: 陸地
           land: 陸地

-          marsh: 沼澤
+          marsh: æ²³å·\9dæ¿\95å\9c°

           moor: 停泊處
           mud: 泥地
           moor: 停泊處
           mud: 泥地

-          peak: 山頂
+          peak: 山峰

           point: 點
           reef: 礁
           ridge: 山脊
           point: 點
           reef: 礁
           ridge: 山脊

-          rock: 岩石
+          rock: 獨立岩

           saddle: 鞍部
           sand: 沙地
           saddle: 鞍部
           sand: 沙地

-          scree: 岩屑堆
+          scree: 碎石堆

           scrub: 灌木
           spring: 泉
           scrub: 灌木
           spring: 泉

-          stone: 石
+          stone: 巨石

           strait: 海峡
           tree: 樹木
           strait: 海峡
           tree: 樹木

-          valley: 山谷
+          valley: 谷地

           volcano: 火山
           water: 水
           wetland: 濕地
           volcano: 火山
           water: 水
           wetland: 濕地

-          wood: 樹林
+          wood: 自然林

         office:
           accountant: 會計師事務所
           administrative: 管理局
         office:
           accountant: 會計師事務所
           administrative: 管理局

-          architect: 建築師樓
+          architect: 建築師事務所

           company: 公司
           company: 公司

-          employment_agency: 就業中介
-          estate_agent: 地產代理
+          employment_agency: 人力仲介
+          estate_agent: 房地產仲介

           government: 政府辦事處
           government: 政府辦事處

-          insurance: 保險
+          insurance: 保險事務所

           lawyer: 律師
           ngo: 非政府組織辦公室
           lawyer: 律師
           ngo: 非政府組織辦公室

-          telecommunication: é\9b»信辦公室
+          telecommunication: é\80\9aè¨\8a信辦公室

           travel_agent: 旅行社
           "yes": 辦公室
         place:
           travel_agent: 旅行社
           "yes": 辦公室
         place:

-          allotments: 小園地
-          block: 區塊
+          allotments: 社區農園
+          block: 街區

           airport: 機場
           city: 城市
           country: 國家
           county: 縣
           airport: 機場
           city: 城市
           country: 國家
           county: 縣

-          farm: 農場
+          farm: 農田

           hamlet: 村莊
           house: 房屋
           houses: 房屋
           hamlet: 村莊
           house: 房屋
           houses: 房屋


@@ -756,26 +757,26 @@ zh-TW:
           moor: 荒野
           municipality: 自治市
           neighbourhood: 居住區
           moor: 荒野
           municipality: 自治市
           neighbourhood: 居住區

-          postcode: 郵政編號
+          postcode: 郵遞區號

           region: 區域
           sea: 海
           state: 省
           region: 區域
           sea: 海
           state: 省

-          subdivision: 細分
+          subdivision: 次分區

           suburb: 郊區
           town: 鄉鎮
           unincorporated_area: 非建制地區
           village: 村落
           suburb: 郊區
           town: 鄉鎮
           unincorporated_area: 非建制地區
           village: 村落

-          "yes": 地點
+          "yes": 地名

         railway:
           abandoned: 已拆除鐵路
           construction: 建造中鐵路
           disused: 廢棄鐵路
         railway:
           abandoned: 已拆除鐵路
           construction: 建造中鐵路
           disused: 廢棄鐵路

-          disused_station: 廢棄火車站
+          disused_station: 廢棄鐵路車站

           funicular: 纜索鐵路
           funicular: 纜索鐵路

-          halt: 鐵路站
-          historic_station: 歷史鐵路站
+          halt: 鐵路停靠站
+          historic_station: 歷史鐵路車站

           junction: 鐵路交匯處
           junction: 鐵路交匯處

-          level_crossing: 道口
+          level_crossing: 平交道

           light_rail: 輕鐵
           miniature: 微型鐵路
           monorail: 單軌鐵路
           light_rail: 輕鐵
           miniature: 微型鐵路
           monorail: 單軌鐵路


@@ -784,15 +785,15 @@ zh-TW:
           preserved: 保留鐵路
           proposed: 規劃鐵路
           spur: 鐵路支線
           preserved: 保留鐵路
           proposed: 規劃鐵路
           spur: 鐵路支線

-          station: 鐵路站
+          station: 鐵路車站

           stop: 鐵路停車處
           stop: 鐵路停車處

-          subway: 地鐵
-          subway_entrance: 地鐵出入口
+          subway: 地下鐵
+          subway_entrance: 地下鐵出入口

           switch: 道岔
           switch: 道岔

-          tram: 電車軌道
-          tram_stop: 電車站
+          tram: 路面電車
+          tram_stop: 路面電車停靠站

         shop:
         shop:

-          alcohol: 無授權條款
+          alcohol: 酒館

           antiques: 古玩店
           art: 藝術品店
           bakery: 麵包店
           antiques: 古玩店
           art: 藝術品店
           bakery: 麵包店


@@ -801,60 +802,60 @@ zh-TW:
           bicycle: 自行車店
           books: 書店
           boutique: 精品店
           bicycle: 自行車店
           books: 書店
           boutique: 精品店

-          butcher: 肉食店
-          car: 車店
+          butcher: 肉品店
+          car: 汽車店

           car_parts: 汽車零件
           car_repair: 汽車維修
           carpet: 地毯店
           charity: 慈善商店
           car_parts: 汽車零件
           car_repair: 汽車維修
           carpet: 地毯店
           charity: 慈善商店

-          chemist: 化學品店
+          chemist: 化學材料桁

           clothes: 服裝店
           computer: 電腦商店
           clothes: 服裝店
           computer: 電腦商店

-          confectionery: ç³\96æ\9e\9c店
-          convenience: 便利店
+          confectionery: ç\94\9cé»\9e店
+          convenience: 便å\88©å\95\86åº\97

           copyshop: 複印店
           cosmetics: 化妝品店
           copyshop: 複印店
           cosmetics: 化妝品店

-          deli: 熟食店
+          deli: 高級食品店

           department_store: 百貨商店
           discount: 特價商品店
           department_store: 百貨商店
           discount: 特價商品店

-          doityourself: DIY
+          doityourself: DIY 用品店

           dry_cleaning: 乾洗
           dry_cleaning: 乾洗

-          electronics: 電子產品商店
-          estate_agent: 地產代理
+          electronics: 電子材料行
+          estate_agent: 房地產仲介

           farm: 農場商店
           fashion: 時裝店
           farm: 農場商店
           fashion: 時裝店

-          fish: 魚店
+          fish: 魚貨店

           florist: 花店
           food: 食品店
           florist: 花店
           food: 食品店

-          funeral_directors: 殮葬服務
-          furniture: å\82¢ä¿¬
+          funeral_directors: 葬儀社
+          furniture: å\82¢ä¿±è¡\8c

           gallery: 畫廊
           garden_centre: 園藝中心
           general: 一般商店
           gift: 禮品店
           gallery: 畫廊
           garden_centre: 園藝中心
           general: 一般商店
           gift: 禮品店

-          greengrocer: 蔬菜水果店
+          greengrocer: 生鮮食品店

           grocery: 雜貨店
           hairdresser: 理髮店
           grocery: 雜貨店
           hairdresser: 理髮店

-          hardware: 五金店
+          hardware: 五金行

           hifi: 音響店
           insurance: 保險
           jewelry: 珠寶店
           hifi: 音響店
           insurance: 保險
           jewelry: 珠寶店

-          kiosk: 售貨亭
-          laundry: 洗衣房
+          kiosk: 販售亭
+          laundry: 洗衣店

           mall: 購物商場
           mall: 購物商場

-          market: 市集
-          mobile_phone: 手機店
-          motorcycle: æ\91©æ\89\98è»\8aåº\97
+          market: 市場
+          mobile_phone: 行動通訊行
+          motorcycle: æ©\9fè»\8aè¡\8c

           music: 唱片行
           music: 唱片行

-          newsagent: 報刊亭
-          optician: 驗眼師
+          newsagent: 新聞代理商
+          optician: 驗光師

           organic: 有機食品店
           organic: 有機食品店

-          outdoor: 戶外店
+          outdoor: 戶外用品店

           pet: 寵物店
           pharmacy: 藥房
           photo: 照相館
           salon: 美容院
           pet: 寵物店
           pharmacy: 藥房
           photo: 照相館
           salon: 美容院

-          second_hand: 二手店
+          second_hand: äº\8cæ\89\8bå\95\86å\93\81åº\97

           shoes: 鞋店
           shopping_centre: 購物中心
           sports: 體育用品店
           shoes: 鞋店
           shopping_centre: 購物中心
           sports: 體育用品店


@@ -863,24 +864,24 @@ zh-TW:
           tailor: 裁縫店
           toys: 玩具店
           travel_agency: 旅行社
           tailor: 裁縫店
           toys: 玩具店
           travel_agency: 旅行社

-          video: 音像店
-          wine: 無授權條款
+          video: 影音店
+          wine: 酒館

           "yes": 商店
         tourism:
           "yes": 商店
         tourism:

-          alpine_hut: 高山小屋
+          alpine_hut: 山屋

           apartment: 公寓
           artwork: 美工
           attraction: 景點
           bed_and_breakfast: 家庭旅館
           cabin: 小木屋
           camp_site: 營地
           apartment: 公寓
           artwork: 美工
           attraction: 景點
           bed_and_breakfast: 家庭旅館
           cabin: 小木屋
           camp_site: 營地

-          caravan_site: 房車宿營地
-          chalet: 小屋
+          caravan_site: RV 宿營區
+          chalet: 小木屋

           gallery: 藝廏
           guest_house: 賓館
           hostel: 旅舍
           hotel: 酒店
           gallery: 藝廏
           guest_house: 賓館
           hostel: 旅舍
           hotel: 酒店

-          information: 資訊
+          information: 旅遊中心

           motel: 汽車旅館
           museum: 博物館
           picnic_site: 野餐地
           motel: 汽車旅館
           museum: 博物館
           picnic_site: 野餐地


@@ -888,20 +889,20 @@ zh-TW:
           viewpoint: 觀景點
           zoo: 動物園
         tunnel:
           viewpoint: 觀景點
           zoo: 動物園
         tunnel:

-          culvert: æ\8e\92æ°´管
+          culvert: 涵管

           "yes": 隧道
         waterway:
           "yes": 隧道
         waterway:

-          artificial: 人工航道
+          artificial: 人工水道

           boatyard: 船塢
           canal: 運河
           dam: 水壩
           derelict_canal: 廢棄運河
           boatyard: 船塢
           canal: 運河
           dam: 水壩
           derelict_canal: 廢棄運河

-          ditch: 溝
+          ditch: 小溝渠

           dock: 碼頭
           dock: 碼頭

-          drain: 渠
-          lock: 鎖
+          drain: æº\9dæ¸ 
+          lock: 水門

           lock_gate: 船閘
           lock_gate: 船閘

-          mooring: 繫泊設備
+          mooring: 停泊處

           rapids: 急流
           river: 河流
           stream: 小溪
           rapids: 急流
           river: 河流
           stream: 小溪


@@ -954,7 +955,7 @@ zh-TW:
     intro_text: OpenStreetMap 是一幅世界地圖，由像您這樣的人們所建立，在開放授權下可以自由使用。
     intro_2_create_account: 建立使用者帳號
     partners_html: 主機由 %{ucl}、%{ic}、%{bytemark}，和其他 %{partners} 所支援。
     intro_text: OpenStreetMap 是一幅世界地圖，由像您這樣的人們所建立，在開放授權下可以自由使用。
     intro_2_create_account: 建立使用者帳號
     partners_html: 主機由 %{ucl}、%{ic}、%{bytemark}，和其他 %{partners} 所支援。

-    partners_ucl: 倫敦大學學院 VR 中心
+    partners_ucl: 倫敦大學學院

     partners_ic: 倫敦帝國學院
     partners_bytemark: Bytemark 主機代管
     partners_partners: 合作夥伴
     partners_ic: 倫敦帝國學院
     partners_bytemark: Bytemark 主機代管
     partners_partners: 合作夥伴


@@ -1370,24 +1371,24 @@ zh-TW:
           primary: 一級道路
           secondary: 二級道路
           unclassified: 未分級道路
           primary: 一級道路
           secondary: 二級道路
           unclassified: 未分級道路

-          track: 行車小徑
+          track: 產業道路

           bridleway: 馬道
           cycleway: 自行車道
           cycleway_national: 國家自行車道
           cycleway_regional: 區域自行車道
           bridleway: 馬道
           cycleway: 自行車道
           cycleway_national: 國家自行車道
           cycleway_regional: 區域自行車道

-          cycleway_local: 本地自行車道
+          cycleway_local: 地區自行車道

           footway: 步道
           rail: 鐵路
           footway: 步道
           rail: 鐵路

-          subway: 地鐵
+          subway: 地下鐵

           tram:
           - 輕軌
           tram:
           - 輕軌

-          - 電車
+          - 路面電車

           cable:
           cable:

-          - 纜車
-          - 升降纜車
+          - 大型纜車
+          - 升降吊椅

           runway:
           - 機場跑道
           runway:
           - 機場跑道

-          - 飛機滑行道
+          - 滑行道

           apron:
           - 機場停機坪
           - 航廈
           apron:
           - 機場停機坪
           - 航廈


@@ -1399,38 +1400,38 @@ zh-TW:
           resident: 住宅區
           common:
           - 共有地
           resident: 住宅區
           common:
           - 共有地

-          - 草地
-          retail: 零售區
+          - 野草地
+          retail: 商店區

           industrial: 工業區
           commercial: 商業區
           industrial: 工業區
           commercial: 商業區

-          heathland: 荒地
+          heathland: 石楠荒地

           lake:
           - 湖泊
           lake:
           - 湖泊

-          - æ± å¡\98
+          - 水庫

           farm: 農田
           farm: 農田

-          brownfield: 廢棄工業區
-          cemetery: å¢\93å\9c°
-          allotments: 小園地
+          brownfield: 低污染再利用地
+          cemetery: å\85¬å¢\93
+          allotments: 社區農園

           pitch: 運動場
           pitch: 運動場

-          centre: é«\94è\82²中心
+          centre: é\81\8bå\8b\95中心

           reserve: 自然保護區
           military: 軍事區
           school:
           - 學校
           - 大學
           building: 重要建築
           reserve: 自然保護區
           military: 軍事區
           school:
           - 學校
           - 大學
           building: 重要建築

-          station: 火車站
+          station: 鐵路車站

           summit:
           summit:

+          - 頂峰

           - 山峰
           - 山峰

-          - 峰頂

           tunnel: 虛線邊框 = 隧道
           bridge: 黑線邊框 = 橋樑
           private: 私人進出
           destination: 目的地進出
           construction: 道路施工中
           bicycle_shop: 自行車店
           tunnel: 虛線邊框 = 隧道
           bridge: 黑線邊框 = 橋樑
           private: 私人進出
           destination: 目的地進出
           construction: 道路施工中
           bicycle_shop: 自行車店

-          bicycle_parking: 自行車停車位
-          toilets: 洗手間
+          bicycle_parking: 自行車停車場
+          toilets: 廁所

     richtext_area:
       edit: 編輯
       preview: 預覽
     richtext_area:
       edit: 編輯
       preview: 預覽


@@ -2129,7 +2130,7 @@ zh-TW:
         popup: 你在該點的 {distance}{unit} 範圍內
       base:
         standard: 標準
         popup: 你在該點的 {distance}{unit} 範圍內
       base:
         standard: 標準

-        cycle_map: 單車地圖
+        cycle_map: 自行車地圖

         transport_map: 交通運輸地圖
         hot: 人道救援
       layers:
         transport_map: 交通運輸地圖
         hot: 人道救援
       layers: