Merge 16110:16487 from trunk.

[rails.git] / config / locales / zh-TW.yml

diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index c93f5e0eb2f3a6da401ba8ea966d040def9eb1a5..9792d1477352786691b153f593c6ab0ce5120c65 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -79,7 +79,7 @@ zh-TW:
   browse:
     changeset:
       title: "變更組合"
   browse:
     changeset:
       title: "變更組合"

-      changeset: "變更組合："
+      changeset: "變更組合： {{id}}"

       download: "下載 {{changeset_xml_link}} 或 {{osmchange_xml_link}}"
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"
       download: "下載 {{changeset_xml_link}} 或 {{osmchange_xml_link}}"
       changesetxml: "Changeset XML"
       osmchangexml: "osmChange XML"


@@ -100,12 +100,11 @@ zh-TW:
       version: "版本："
       in_changeset: "於變更組合："
     containing_relation:
       version: "版本："
       in_changeset: "於變更組合："
     containing_relation:

-      relation: "關係 {{relation_name}}"
-      relation_as: "(as {{relation_role}})"
+      entry: "關係 {{relation_name}}"
+      entry_role: "關係 {{relation_name}} (as {{relation_role}})"

     map:
       loading: "正在載入..."
       deleted: "已刪除"
     map:
       loading: "正在載入..."
       deleted: "已刪除"

-      view_larger_map: "檢視較大的地圖"

     node_details:
       coordinates: "坐標："
       part_of: "部分："
     node_details:
       coordinates: "坐標："
       part_of: "部分："


@@ -135,8 +134,6 @@ zh-TW:
     relation_history:
       relation_history: "關係歷史紀錄"
       relation_history_title: "關係歷史紀錄： {{relation_name}}"
     relation_history:
       relation_history: "關係歷史紀錄"
       relation_history_title: "關係歷史紀錄： {{relation_name}}"

-    relation_member:
-      as: "為"

     relation:
       relation: "關係"
       relation_title: "關係： {{relation_name}}"
     relation:
       relation: "關係"
       relation_title: "關係： {{relation_name}}"


@@ -321,9 +318,15 @@ zh-TW:
       add_marker: "加入標記至地圖"
       view_larger_map: "檢視較大的地圖"
   geocoder:
       add_marker: "加入標記至地圖"
       view_larger_map: "檢視較大的地圖"
   geocoder:

+    search:
+      title:
+        latlon: '結果 從 <a href="http://openstreetmap.org/">Internal</a>'
+        us_postcode: '結果 從 <a href="http://geocoder.us/">Geocoder.us</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_namefinder: '結果 從 <a href="http://gazetteer.openstreetmap.org/namefinder/">OpenStreetMap Namefinder</a>'
+        geonames: '結果 從 <a href="http://www.geonames.org/">GeoNames</a>'

     results:
     results:

-      results: "結果"
-      type_from_source: "{{type}} 從 {{source_link}}"

       no_results: "找不到任何結果"
   layouts:
     project_name:
       no_results: "找不到任何結果"
   layouts:
     project_name:


@@ -560,7 +563,6 @@ zh-TW:
       search: "搜尋"
       where_am_i: "我在哪裡？"
       submit_text: "走"
       search: "搜尋"
       where_am_i: "我在哪裡？"
       submit_text: "走"

-      searching: "搜尋中..."

       search_help: "範例： 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', 或 'post offices near L羹nen' <a href='http://wiki.openstreetmap.org/wiki/Search'>更多範例...</a>"
     key:
       map_key: "圖例"
       search_help: "範例： 'Alkmaar', 'Regent Street, Cambridge', 'CB2 5AQ', 或 'post offices near L羹nen' <a href='http://wiki.openstreetmap.org/wiki/Search'>更多範例...</a>"
     key:
       map_key: "圖例"


@@ -614,7 +616,7 @@ zh-TW:
       make_public: "將這個追蹤永遠標記為公開"
       edit_track: "編輯這個追蹤"
       delete_track: "刪除這個追蹤"
       make_public: "將這個追蹤永遠標記為公開"
       edit_track: "編輯這個追蹤"
       delete_track: "刪除這個追蹤"

-      viewing_trace: "正在檢視追蹤 {{name}}"
+      heading: "正在檢視追蹤 {{name}}"

       trace_not_found: "找不到追蹤！"
     trace_paging_nav:
       showing: "正在顯示頁面"
       trace_not_found: "找不到追蹤！"
     trace_paging_nav:
       showing: "正在顯示頁面"