Merge remote-tracking branch 'upstream/pull/2131'

[rails.git] / config / locales / km.yml

diff --git a/config/locales/km.yml b/config/locales/km.yml
index eda1328f5e4ec19558adb535788ca4bb07ce01cd..f9cc2b04cdafdfb4f5ca4a080e8644c460da0a63 100644 (file)
--- a/config/locales/km.yml
+++ b/config/locales/km.yml
@@ -148,13 +148,13 @@ km:
     note:
       title: កំណត់សម្គាល់៖ %{id}
       new_note: កំណត់សម្គាល់ថ្មី
-      description: á\9e\94á\9e\9aá\9e·á\9e\99á\9e¶á\9e\99â\80\8bá\9f\96
+      description: á\9e\80á\9e¶á\9e\9aá\9e\96á\9e·á\9e\96á\9e\8eá\9f\8cá\9e\93á\9e¶
       open_by: បង្កើតដោយ %{user} <abbr title='%{exact_time}'>%{when} មុន</abbr>
       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>
-  changeset:
+  changesets:
     changeset_paging_nav:
       showing_page: ទំព័រ %{page}
       next: បន្ទាប់ »
@@ -162,30 +162,30 @@ km:
     changeset:
       anonymous: អនាមិក
       no_edits: (គ្មានកំណែប្រែ​)
-      view_changeset_details: á\9e\98á\9e¾á\9e\9bá\9e\96á\9f\90á\9e\8fá\9f\8cá\9e\98á\9e¶á\9e\93á\9e\9bá\9e\98á\9f\92á\9e¢á\9e·á\9e\8fá\9e\93á\9f\83á\9e\9fá\9f\86á\9e\93á\9e»á\9f\86â\80\8bá\9e\94á\9f\86លាស់ប្តូរ​
+      view_changeset_details: á\9e\98á\9e¾á\9e\9bá\9e\96á\9f\90á\9e\8fá\9f\8cá\9e\98á\9e¶á\9e\93á\9e\9bá\9e\98á\9f\92á\9e¢á\9e·á\9e\8fá\9e\9aá\9e\94á\9e\9fá\9f\8bá\9e\9fá\9f\86á\9e\8eá\9e»á\9f\86á\9e\94á\9e\93á\9f\92លាស់ប្តូរ​
     changesets:
-      id: ID
+      id: អត្តលេខ
       saved_at: បានរក្សាទុក​នៅ​
       user: អ្នកប្រើប្រាស់​
       comment: មតិយោបល់​
       area: តំបន់
     index:
       title: សំណុំបន្លាស់ប្ដូរ
-      title_user: á\9e\9fá\9f\86á\9e\93á\9e»á\9f\86â\80\8bá\9e\94á\9f\86á\9e\9bá\9e¶á\9e\9fá\9f\8bá\9e\94á\9f\92á\9e\8fá\9e¼á\9e\9aâ\80\8b ដោយ %{user}
-      title_friend: សំណុំបន្លាស់ប្ដូរដោយមិត្តភក្ដិខ្ញុំ
-      title_nearby: សំណុំបន្លាស់ប្ដូរដោយអ្នកប្រើប្រាស់ក្បែរៗអ្នក
-      empty: រកមិនឃើញសំណុំបន្លាស់ប្ដូរ។
+      title_user: á\9e\9fá\9f\86á\9e\8eá\9e»á\9f\86á\9e\94á\9e\93á\9f\92á\9e\9bá\9e¶á\9e\9fá\9f\8bá\9e\94á\9f\92á\9e\8aá\9e¼á\9e\9aá\9e\92á\9f\92á\9e\9cá\9e¾ដោយ %{user}
+      title_friend: á\9e\9fá\9f\86á\9e\8eá\9e»á\9f\86á\9e\94á\9e\93á\9f\92á\9e\9bá\9e¶á\9e\9fá\9f\8bá\9e\94á\9f\92á\9e\8aá\9e¼á\9e\9aá\9e\92á\9f\92á\9e\9cá\9e¾á\9e\8aá\9f\84á\9e\99á\9e\98á\9e·á\9e\8fá\9f\92á\9e\8fá\9e\97á\9e\80á\9f\92á\9e\8aá\9e·á\9e\81á\9f\92á\9e\89á\9e»á\9f\86
+      title_nearby: á\9e\9fá\9f\86á\9e\8eá\9e»á\9f\86á\9e\94á\9e\93á\9f\92á\9e\9bá\9e¶á\9e\9fá\9f\8bá\9e\94á\9f\92á\9e\8aá\9e¼á\9e\9aá\9e\92á\9f\92á\9e\9cá\9e¾á\9e\8aá\9f\84á\9e\99á\9e¢á\9f\92á\9e\93á\9e\80á\9e\94á\9f\92á\9e\9aá\9e¾á\9e\94á\9f\92á\9e\9aá\9e¶á\9e\9fá\9f\8bá\9e\80á\9f\92á\9e\94á\9f\82á\9e\9aá\9f\97á\9e¢á\9f\92á\9e\93á\9e\80
+      empty: á\9e\9aá\9e\80á\9e\98á\9e·á\9e\93á\9e\83á\9e¾á\9e\89á\9e\9fá\9f\86á\9e\8eá\9e»á\9f\86á\9e\94á\9e\93á\9f\92á\9e\9bá\9e¶á\9e\9fá\9f\8bá\9e\94á\9f\92á\9e\8aá\9e¼á\9e\9aá\9e\91á\9f\81á\9f\94
       empty_area: គ្មានសំណុំបន្លាស់ប្ដូរនៅក្នុងតំបន់នេះទេ។
-      empty_user: គ្មានសំណុំបន្លាស់ប្ដូរដោយអ្នកប្រើប្រាស់នេះទេ។
+      empty_user: á\9e\82á\9f\92á\9e\98á\9e¶á\9e\93á\9e\9fá\9f\86á\9e\8eá\9e»á\9f\86á\9e\94á\9e\93á\9f\92á\9e\9bá\9e¶á\9e\9fá\9f\8bá\9e\94á\9f\92á\9e\8aá\9e¼á\9e\9aá\9e\92á\9f\92á\9e\9cá\9e¾á\9e\8aá\9f\84á\9e\99á\9e¢á\9f\92á\9e\93á\9e\80á\9e\94á\9f\92á\9e\9aá\9e¾á\9e\94á\9f\92á\9e\9aá\9e¶á\9e\9fá\9f\8bá\9e\93á\9f\81á\9f\87á\9e\91á\9f\81á\9f\94
       no_more: រកមិនឃើញសំណុំបន្លាស់ប្ដូរថែមទៀតទេ។
       no_more_area: គ្មានសំណុំបន្លាស់ប្ដូរថែមទៀតទេក្នុងតំបន់នេះ។
       no_more_user: គ្មានសំណុំបន្លាស់ប្ដូរដោយអ្នកប្រើប្រាស់នេះថែមទៀតទេ។
       load_more: ផ្ទុកបន្ថែម
-  diary_entry:
+  diary_entries:
     new:
       title: ប្រកាសកំណត់ហេតុថ្មី
       publish_button: បោះផ្សាយ
-    list:
+    index:
       title: កំណត់ហេតុរបស់អ្នកប្រើប្រាស់
       title_friends: កំណត់ហេតុរបស់មិត្តភក្ដិ
       title_nearby: កំណត់ហេតុរបស់អ្នកប្រើប្រាស់នៅក្បែរៗ
@@ -761,7 +761,7 @@ km:
     form:
       name: ឈ្មោះ​
       allow_write_api: កែសម្រួលផែនទី​
-  user:
+  users:
     login:
       title: កត់ឈ្មោះចូល
       heading: កត់ឈ្មោះចូល