X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/0eb2afa83aee217fc2c6399bd23d0d8152c09eb5..0254f7ee0969f976d536118198bf752029dcd494:/config/locales/xmf.yml?ds=sidebyside

diff --git a/config/locales/xmf.yml b/config/locales/xmf.yml
index 322044caa..601f3d17c 100644
--- a/config/locales/xmf.yml
+++ b/config/locales/xmf.yml
@@ -13,7 +13,7 @@ xmf:
       prompt: á¤ááááá¨ ááá¨áááá á£á
     submit:
       diary_comment:
-        create: á©á£ááá
+        create: áááááá¢áá á
       diary_entry:
         create: áá£áááááááá¤á
         update: áááá®áááá¤á
@@ -24,7 +24,7 @@ xmf:
       client_application:
         create: á áááá¡á¢á ááªáá
         update: áááá®áááá¤á
-      doorkeeper_application:
+      oauth2_application:
         create: á áááá¡á¢á ááªáá
         update: áááá®áááá¤á
       redaction:
@@ -54,7 +54,6 @@ xmf:
       message: ááááá¤á
       node: á­á£á á­á£áá
       node_tag: á­á£á á­á£ááá¨ á®ááá¢áá
-      notifier: áá·ááá áá®áááááá á
       old_node: á¯ááá¨á á­á£á á­á£áá
       old_node_tag: á­á£á á­á£ááá¨ á¯ááá¨á á®ááá¢áá
       old_relation: á¯ááá¨á á£á áááá áááá
@@ -96,9 +95,10 @@ xmf:
       diary_entry:
         user: ááá®ááá ááá£
         title: 'áááá:'
+        body: á¢áá¥á¡á¢á
         latitude: áááááá
         longitude: áá á«ááá
-        language: áááá
+        language_code: áááá
       doorkeeper/application:
         name: á¯áá®á
         redirect_uri: URIs ááááá¬á£á áá¤á
@@ -230,15 +230,32 @@ xmf:
       entry:
         comment: áááááá¢áá á
         full: ááááá£á¨ááá á¢áá¥á¡á¢á
+  account:
+    deletions:
+      show:
+        title: á©á¥ááá ááááá áá¨áá¨ ááá¡á£á
+        warning: áá£á  áá£á©áá! ááááá áá¨áá¨ ááá¡á£á á¤ááááá£á  áá ááªáá¡áá¡ á á, áááá£á¨ ááá ááááá¤á ááá¨ááááá.
+        delete_account: ááááá áá¨áá¨ ááá¡á£á
+        confirm_delete: ááá¡á£á á áááááá·áááá?
+        cancel: ááá£á¥ááá¤á
+  accounts:
+    edit:
+      my settings: á©á¥ááá ááá áááá¢á áá¤á
+      current email address: áá-á¤áá¡á¢áá¨ áá¡ááááá áááá¬á£á áá¤á£
+      openid:
+        link text: áá£ á á áááá?
+      public editing:
+        enabled link text: áá£ á á áááá?
+        disabled link text: áá£á¨áá ááá¨áááááá£ á áááá¥á¢áá áá¤á?
+      contributor terms:
+        link text: áá£ á á áááá?
+      save changes button: ááá á£áá¤áá¨ á©á£ááá
+      delete_account: ááááá áá¨áá¨ ááá¡á£á...
+    destroy:
+      success: ááááá áá¨áá¥ ááááá¡á·.
   browse:
     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: ááááááá
@@ -264,10 +281,6 @@ xmf:
       relation: á£á áááá ááááá¤á (%{count})
       relation_paginated: á£á áááá ááááá¤á (%{x}-%{y} %{count}-á¨á)
       comment: áááááá¢áá áá¤á (%{count})
-      hidden_commented_by_html: á¢á§ááááááá áááááá¢áá áá¤á %{user}-á¨á <abbr title='%{exact_time}'>%{when}
-        ááááá®</abbr>
-      commented_by_html: ááááááá¢áá á %{user}-á¨á <abbr title='%{exact_time}'>%{when}
-        ááááá®</abbr>
       changesetxml: ááá á£áá¤áá¨ ááááá¢áá¨ XML
       osmchangexml: osmChange XML
       feed:
@@ -347,31 +360,6 @@ xmf:
       wikimedia_commons_link: ááááááá¢á %{page} áááááá¬ááá á£áá¡
       telephone_link: á ááá£á %{phone_number}
       colour_preview: á¤áá á %{colour_value} ááá¬áááááá áá¤á
-    note:
-      title: 'á®ááááá¤á: %{id}'
-      new_note: áá®ááá á®ááááá¤á
-      description: áá­áá á£á
-      open_title: 'á£áá£áá£á¨ááá£ á®ááááá¤á #%{note_name}'
-      closed_title: 'áááá£á¨ááá£áá á®ááááá¤á #%{note_name}'
-      hidden_title: 'á¢á§áááááá¤ááá á®ááááá¤á #%{note_name}'
-      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>
-      closed_by_html: áááá£á¨ááá£áá á á ááá®ááá ááá£ %{user}-á¨áá <abbr title='%{exact_time}'>%{when}
-        ááááá®</abbr>
-      closed_by_anonymous_html: áááá£á¨ááá£áá á á ááááááá£á á <abbr title='%{exact_time}'>%{when}
-        ááááá®</abbr>
-      reopened_by_html: ááá®ááá ááá£ %{user}-á¥ áá®ááá¨á áááá¬á§á£ <abbr title='%{exact_time}'>%{when}
-        ááááá®</abbr>
-      reopened_by_anonymous_html: áá®ááá¨á áááá¬á§á£áááá á á ááááááá£á á <abbr title='%{exact_time}'>%{when}
-        ááááá®</abbr>
-      hidden_by_html: ááá¢á§ááááá£ %{user}-á¥ <abbr title='%{exact_time}'>%{when} ááááá®</abbr>
-      report: á¥á·ááááááá¤áá áá ááá¦áááá£áá¨ ááá¨á
     query:
       title: áá£ á á ááá¥?
       introduction: á£áá®áááá¨á ááááá¥á¢áá¤áá¨ áááá ááá á¥ááá£áá­áá áá á á£áá.
@@ -749,7 +737,6 @@ xmf:
           commercial: ááááá áªáá£áá á¢áá áá¢áá áá
           conservation: áááá¡áá áááªáá
           construction: áááááá¤á
-          farm: á¤áá áá
           farmland: áá áááá£
           forest: á¢á§á
           grass: ááááá á
@@ -992,6 +979,9 @@ xmf:
         waterway:
           artificial: á®ááá£ááá£á á á¬á§áá ááááá
           canal: áá á®á
+  users:
+    auth_failure:
+      unknown_error: áááááá¢áá¤ááááªááá¥ áááá¨áá áá·
   user_blocks:
     show:
       created: 'ááá­á§á·:'
@@ -1000,4 +990,13 @@ xmf:
   notes:
     index:
       no_notes: áá á á á®ááááá¤áá¤á
+    show:
+      title: 'á®ááááá¤á: %{id}'
+      description: áá­áá á£á
+      open_title: 'á£áá£áá£á¨ááá£ á®ááááá¤á #%{note_name}'
+      closed_title: 'áááá£á¨ááá£áá á®ááááá¤á #%{note_name}'
+      hidden_title: 'á¢á§áááááá¤ááá á®ááááá¤á #%{note_name}'
+      report: á¥á·ááááááá¤áá áá ááá¦áááá£áá¨ ááá¨á
+    new:
+      title: áá®ááá á®ááááá¤á
 ...