X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/281d7992f857e7e7c64947a06470898c35035bb6..b470e01f840d1b954326f8f863e185ebe7f9b9f2:/config/locales/km.yml?ds=sidebyside

diff --git a/config/locales/km.yml b/config/locales/km.yml
index 6f725f6f4..5c58f7ddb 100644
--- a/config/locales/km.yml
+++ b/config/locales/km.yml
@@ -72,6 +72,8 @@ km:
         longitude: ááááááááá
         public: áá¶áá¶áááâ
         description: ááá·áá¶áâ
+        gpx_file: áááá»áá¡á¾áâá¯ááá¶á GPX á
+        tagstring: áááá¶áâá
       message:
         sender: á¢ááááááá¾â
         title: ááááá¶áááâ
@@ -119,23 +121,23 @@ km:
       join_discussion: áááááááááá¼ááá¾áááá¸áá¼ááá½ááá·áá¶áááá¶
       discussion: áá¶ááá·áá¶áááá¶
     node:
-      title: áááááá %{name}
-      history_title: áááááááá·áááááá %{name}
+      title_html: áááááá %{name}
+      history_title_html: áááááááá·áááááá %{name}
     way:
-      title: áááá¼áá %{name}
-      history_title: áááááááá·áááá¼áá %{name}
+      title_html: áááá¼áá %{name}
+      history_title_html: áááááááá·áááá¼áá %{name}
       nodes: ááááá
     relation:
       members: ááá¶áá·á
     relation_member:
-      entry_role: '%{type} %{name} áá¶ %{role}'
+      entry_role_html: '%{type} %{name} áá¶ %{role}'
       type:
         node: ááááá
         way: áááá¼áâ
         relation: áááá¶áááááá
     containing_relation:
-      entry: áááá¶ááááááâ %{relation_name}
-      entry_role: áááá¶áááááá %{relation_name} (áá¶ %{relation_role})
+      entry_html: áááá¶ááááááâ %{relation_name}
+      entry_role_html: áááá¶áááááá %{relation_name} (áá¶ %{relation_role})
     not_found:
       sorry: áá¼áááá áááá·ááá¾á %{type}%{id}â ááá
       type:
@@ -164,11 +166,12 @@ km:
       title: áááááááááá¶ááá %{id}
       new_note: áááááááááá¶áááááá¸
       description: áá¶ááá·ááááá¶
-      opened_by: ááááá¾áááá %{user} <abbr title='%{exact_time}'>%{when} áá»á</abbr>
-      opened_by_anonymous: ááááá¾áá¡á¾ááááááá¢áá¶áá·á <abbr title='%{exact_time}'>%{when}
+      opened_by_html: ááááá¾áááá %{user} <abbr title='%{exact_time}'>%{when} áá»á</abbr>
+      opened_by_anonymous_html: ááááá¾áá¡á¾ááááááá¢áá¶áá·á <abbr title='%{exact_time}'>%{when}
+        áá»á</abbr>
+      commented_by_html: ááá·áá¸ %{user} <abbr title='%{exact_time}'>%{when} áá»á</abbr>
+      commented_by_anonymous_html: ááá·áá¸ááá¢áá¶áá·á <abbr title='%{exact_time}'>%{when}
         áá»á</abbr>
-      commented_by: ááá·áá¸ %{user} <abbr title='%{exact_time}'>%{when} áá»á</abbr>
-      commented_by_anonymous: ááá·áá¸ááá¢áá¶áá·á <abbr title='%{exact_time}'>%{when} áá»á</abbr>
   changesets:
     changeset_paging_nav:
       showing_page: ááááá %{page}
@@ -226,7 +229,7 @@ km:
       title: áááááá ááá»áááá %{user} | %{title}
       user_title: áááááá ááá»áááá %{user}
       leave_a_comment: ááááááááá·áááááâ
-      login_to_leave_a_comment: '%{login_link} áá¾áááá¸ááááááááá·áááááâ'
+      login_to_leave_a_comment_html: '%{login_link} áá¾áááá¸ááááááááá·áááááâ'
       login: áááááááááá¼á
     diary_entry:
       comment_count:
@@ -235,18 +238,25 @@ km:
         other: '%{count} ááá·ááááá'
       confirm: ááááá¶ááâ
     diary_comment:
-      comment_from: ááá·áááááâáá¸â %{link_user} áá %{comment_created_at}
+      comment_from_html: ááá·áááááâáá¸â %{link_user} áá %{comment_created_at}
       confirm: ááááá¶ááâ
     location:
       location: áá¸áá¶ááâáâ
       view: áá¾áâ
       edit: áááááá
+  friendships:
+    make_friend:
+      success: '%{name} á¥á¡á¼áááááá¶áá·áááááááá¢áááâá'
+      failed: á¢áááááá, ááá¶ááááááá»ááá¶ááááááá %{name} áá¶áá·áááâá
+      already_a_friend: á¢áááááºáá¶áá·ááááá¶áá½á %{name} áá½áá á¾áâá
+    remove_friend:
+      not_a_friend: '%{name} áá·áááááá¶áá·áááááááá¢áááááâá'
   geocoder:
     search:
       title:
-        latlon: áááááááá¸ <a href="http://openstreetmap.org/">Internal</a>
-        ca_postcode: áááááááá¸ <a href="http://geocoder.ca/">Geocoder.CA</a>
-        geonames: áááááááá¸ <a href="http://www.geonames.org/">GeoNames</a>
+        latlon_html: áááááááá¸ <a href="http://openstreetmap.org/">Internal</a>
+        ca_postcode_html: áááááááá¸ <a href="http://geocoder.ca/">Geocoder.CA</a>
+        geonames_html: áááááááá¸ <a href="http://www.geonames.org/">GeoNames</a>
     search_osm_nominatim:
       prefix:
         aerialway:
@@ -305,7 +315,6 @@ km:
           motorcycle_parking: ááááááááááááá¶ááááá
           nightclub: áááá¹ááá¶áááá¸
           nursing_home: áááááááááá¶ááááá¶ááááá¶
-          office: áá¶áá·áá¶ááá
           parking: áááááááááá
           parking_entrance: áááááá¼ááááááááááá
           parking_space: áááááááááááááá
@@ -314,20 +323,15 @@ km:
           police: ááááá¶á
           post_box: áááá¢ááááááááá¸áá
           post_office: ááá»áááá·áááááááá¸áá
-          preschool: áá¶áá¶áááááááá
           prison: áááááá¶áá¶á
           pub: á á¶ááááá¶
           public_building: á¢á¶áá¶ááá¶áá¶ááá
           recycling: ááááááááááááá¶áá¢á¶ááááá¾á¡á¾ááá·á
           restaurant: ááááá¸ááááá¶á
-          retirement_home: áááááá¶ááááá¶
-          sauna: áááá¶
           school: áá¶áá¶ááá
           shelter: ááááááááááááá½á
-          shop: á á¶á
           shower: áááááááá¼ááá¹á
           social_centre: áááááááááááá·ááá
-          social_club: áááá¹áááááááá¶áááááá
           social_facility: á¢á¶áá¶ááá¶áá¶ááá
           studio: áááá»ááá¸ááá¼
           swimming_pool: á¢á¶áá áááá¹á
@@ -343,7 +347,6 @@ km:
           waste_basket: áá»ááááá¶á
           waste_disposal: ááááááááááá¼ááááá¶á
           water_point: áááááááá¼ááá¹á
-          youth_centre: ááááááá»ááá
         boundary:
           administrative: ááááááááááááá¶á
           census: ááááááááááá¿á
@@ -430,7 +433,6 @@ km:
           reservoir: áá¹ááááá»ááá¹á
           residential: ááááááááááááá¶á
           retail: á á¶áááááá¶á
-          road: ááááááááá¼á
           vineyard: áááá¶ááááá¶áááá¶ááá¼á
         leisure:
           beach_resort: ááááááááá¶ááá
@@ -562,18 +564,15 @@ km:
           dry_cleaning: á á¶ááááá¢áá»á
           electronics: á á¶áá¢áá¡á·ááááá¼áá·á
           estate_agent: áááá¶áááá¶áá¢áááááááá»
-          fish: á á¶ááááá¸
           florist: á á¶ááááá¶
           food: á á¶áá¢á¶á á¶á
           furniture: á á¶ááááá á¶áá¹á
-          gallery: áá·áá·ááááá¶á
           gift: á á¶áááááá»á¢áá»áááá¶ááá¸áá
           greengrocer: á á¶áááááááá·ááááááá¾
           grocery: á á¶ááááá¸á¢á¶á á¶á
           hairdresser: á á¶ááá¶ááááááá·áá¢áá»áááá
           jewelry: á á¶áááááááá¿áá¢áááááá¶á
           laundry: á á¶ááááá¢áá»á
-          market: áááá¶á
           massage: á á¶áááá¶áááá¶
           mobile_phone: á á¶ááá¼áááááá
           motorcycle: á á¶ááááááááá¶ááááá
@@ -582,7 +581,6 @@ km:
           optician: á á¶ááááááá¶
           pawnbroker: á á¶áááááá¶á
           pet: á á¶ááááááá·áááá¹á
-          pharmacy: á±áááááá¶á
           photo: á á¶ááááá¼á
           seafood: á á¶ááááá¿áááá»ááá
           second_hand: á á¶áááá»á
@@ -605,7 +603,6 @@ km:
           zoo: áá½ááááá
         waterway:
           canal: ááááááá¸á
-    description:
       types:
         cities: áááá»áâ
   layouts:
@@ -627,30 +624,21 @@ km:
       text: áá½áâá§áááááááâ
     learn_more: áááááááááááááá
     more: áááááááá
-  notifier:
+  user_mailer:
     diary_comment_notification:
       hi: áá½áááá¸ %{to_user},
     message_notification:
       hi: áá½áááá¸ %{to_user},
-    friend_notification:
+    friendship_notification:
       subject: '[OpenStreetMap] %{user} áá¶áááááááá¢ááááá¶âáá·áááâ'
       had_added_you: '%{user} áá¶áááááááá¢ááááá¶âáá·áááâáá [OpenStreetMap] á'
       see_their_profile: á¢áááá¢á¶ááá¾áâáááááááá·áá¼áâáááááá½ááááá %{userurl} áá·áááááááâáá½ááááá¶áá·áááááááá¢ááááá·ááá¾á¢ááááááâá
-    gpx_notification:
-      greeting: áá½áááá¸,
-      with_description: áá¶áá½áâááá·áá¶áâ
-      and_no_tags: áá·ááááá¶ááááá¶áââá
     signup_confirm:
       subject: '[OpenStreetMap] áá¼ááááá¶áááááááá¶áá OpenStreetMap'
     email_confirm:
       subject: '[OpenStreetMap] ááááá¶ááâá¢á¶áááááá¶áâá¢áá¸áááááááá¢áááâ'
-    email_confirm_plain:
-      greeting: áá½áááá¸,
-    email_confirm_html:
-      greeting: áá½áááá¸â,
-    lost_password_plain:
       greeting: áá½áááá¸,
-    lost_password_html:
+    lost_password:
       greeting: áá½áááá¸â,
   messages:
     inbox:
@@ -723,19 +711,9 @@ km:
           station: áááá¶áá¸áááááá¼áááá
   traces:
     new:
-      upload_gpx: áááá»áá¡á¾áâá¯ááá¶á GPX á
-      description: ááá·áá¶áâá
-      tags: áááá¶áâá
       visibility_help: áá¾ááááá¶ááááâáá¼ááááááâ?
       help: áááá½áâ
     edit:
-      filename: áááááá¯ááá¶áâá
-      download: áá¶ááá
-      uploaded_at: áá¶ááááá»áá¡á¾áâááâá
-      map: ááááá¸â
-      edit: ááááááâ
-      description: ááá·áá¶áâá
-      tags: áááá¶áâá
       visibility_help: áá¾ááááá¶ááááâáá¼ááááááââ?
     trace_optionals:
       tags: áááá¶áâ
@@ -764,10 +742,6 @@ km:
       title: ááááááâááááááááááááááá¢áááâ
     show:
       edit: ááááááâáááááá¶ááááá¢á·áâ
-      allow_write_api: ááááááá½áááááá¸â
-    form:
-      name: áááááâ
-      allow_write_api: ááááááá½áááááá¸â
   users:
     login:
       title: áááááááááá¼á
@@ -832,12 +806,6 @@ km:
       press confirm button: áá»ááá¾ááá¼áá»ááá¶áááááááá¾áááá¸ááááá¶ááá¢á¶áááááá¶áá¢áá¸ááááááá¸ááááá¢áááâá
       button: ááááá¶ááâ
       success: áá¶áááááá¶ááá¢á¶áááááá¶áá¢áá¸áááááááá¢ááááá¼ááá¶ááá á¾á!
-    make_friend:
-      success: '%{name} á¥á¡á¼áááááá¶áá·áááááááá¢áááâá'
-      failed: á¢áááááá, ááá¶ááááááá»ááá¶ááááááá %{name} áá¶áá·áááâá
-      already_a_friend: á¢áááááºáá¶áá·ááááá¶áá½á %{name} áá½áá á¾áâá
-    remove_friend:
-      not_a_friend: '%{name} áá·áááááá¶áá·áááááááá¢áááááâá'
   javascripts:
     embed:
       report_problem: áá¶ááá¶áááâáááá á¶
@@ -851,7 +819,6 @@ km:
         out: ááááá½áááá
       locate:
         title: áááá á¶ááá¸áá¶áááááá»á
-        popup: á¢ááááááá»ááááá·áááááááá¶á {distance} {unit} áá¸áááá»áááá
       base:
         standard: ááááááá¶á
         cycle_map: ááááá¸áááá¼ááááááááá¶á
