]> git.openstreetmap.org Git - rails.git/blobdiff - config/locales/nqo.yml
Localisation updates from https://translatewiki.net.
[rails.git] / config / locales / nqo.yml
index 3d06d9cf7154ddc5f604f1d60fb9d74839cea566..d091e7506363373b9e6e1ff4fd499cfa0bd4e4d5 100644 (file)
@@ -26,9 +26,6 @@ nqo:
         create: ߡߙߌߣߊ߲ ߦߌ߬ߘߊ߬
       message:
         create: ߊ߬ ߗߋ߫
-      client_application:
-        create: ߕߐ߯ߛߓߍߟߌ
-        update: ߟߏ߲ߘߐߦߊߟߌ
       oauth2_application:
         create: ߕߐ߯ߛߓߍߟߌ
         update: ߟߏ߲ߘߐߦߊߟߌ
@@ -197,35 +194,6 @@ nqo:
       entry:
         comment: ߡߙߌߣߊ߲
         full: ߦߟߌߣߐ ߘߝߊߣߍ߲
-  account:
-    deletions:
-      show:
-        title: ߒ ߠߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߖߏ߬ߛߌ߫
-        warning: ߖߊ߲߬ߓߌ߬ߟߊ߬ߟߌ߹ ߖߊ߬ߕߋ߬ߘߊ ߖߏ߬ߛߌ߬ߟߌ ߦߋ߫ ߟߊ߬ߞߎ߬ߙߊ߲߬ߠߌ߲ ߠߋ߬ ߘߌ߫߸ ߊ߬ ߘߏ߲߬
-          ߕߍ߫ ߣߊ߬ ߛߐ߲߬ ߠߊ߫ ߘߐߛߊ߬ ߟߊ߫.
-        delete_account: ߖߊ߬ߕߋ߬ߘߊ ߖߏ߬ߛߌ߫
-        delete_introduction: 'ߌ ߘߌ߫ ߛߴߌ ߟߊ߫ ߏߔߌ߲ߛߑߙߌߕߑߡߊߔ ߖߊ߬ߕߋ߬ߘߊ ߖߏ߬ߛߌ߫ ߟߊ߫ ߘߎ߰ߟߊ߬ߘߐ߬
-          ߞߘߎ ߟߊߓߊ߯ߙߊ ߟߊ߫. ߝߊߙߊ߲ߝߊ߯ߛߟߌ ߢߌ߲߬ ߠߎ߫ ߕߴߌ ߦߟߌ߫ ߟߊ߫ ߖߊ߰ߣߌ߲߫:'
-        delete_profile: ߌ ߟߊ߫ ߢߊߞߙߍ ߞߌ߬ߓߊ߬ߙߏ߬ߦߊ߸ ߞߊߕߘߍ߬ߕߍ߫ ߌ ߟߊ߫ ߊߝ߭ߊߙߑߕߊ߫ ߡߊ߬߸ ߌ
-          ߕߐ߯ߛߓߍߟߌ ߣߴߌ ߘߌ߲߬ߞߌߙߊ ߟߎ߬ ߓߍ߯ ߘߌ߫ ߛߋ߲߬ߓߐ߫.
-        delete_display_name: ߌ ߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ߬ ߕߐ߮ ߘߌ߫ ߛߋ߲߬ߓߐ߫߸ ߊ߬ ߝߊ߲߭ ߘߌ߫ ߛߋ߫ ߟߊߓߊ߯ߙߊ߫
-          ߟߊ߫ ߞߎߘߊ߫ ߘߌ߫ ߖߊ߬ߕߋ߬ߘߊ߫ ߜߘߍ ߟߎ߬ ߓߟߏ߫.
-        retain_caveats: ߏ߬ ߓߟߏߡߊ߬߸ ߌ ߞߌ߬ߓߊ߬ߙߏ߬ߦߊ ߘߏ߫ ߟߎ߫ ߘߌ߫ ߣߊ߬ ߟߊߡߊ߲߲߬ߘߌ߫ ߏߔߌ߲ߛߑߙߌߕߑߡߊߔ
-          ߟߊ߫߸ ߤߊߟߴߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߖߏ߬ߛߌ ߞߐ ߘߐ߫.
-        retain_edits: ߌ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬ ߔߊ߬ߔߘߊ ߟߐ߲ߕߊ ߝߊ߲ ߠߊ߫߸ ߣߴߏ߬ ߞߍ߫ ߘߊ߫
-          ߦߋ߲߬߸ ߏ߬ ߟߎ߬ ߘߌ߫ ߣߊ߬ ߟߊߡߊ߲߲߬ߘߌ߫.
-        retain_traces: ߌ ߟߊ߫ ߜߙߋ߬ ߟߊߦߟߍ߬ߣߍ߲ ߠߎ߬߸ ߣߴߏ߬ ߞߍ߫ ߘߊ߫ ߦߋ߲߬߸ ߏ߬ ߟߎ߬ ߘߌ߫ ߟߊߡߊ߲߬ߘߌ߫.
-        retain_diary_entries: ߌ ߟߊ߫ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߠߎ߬ ߣߌ߫ ߡߙߌߣߊ߲ ߠߎ߬߸ ߣߴߏ߬ ߞߍ߫
-          ߘߊ߫ ߦߋ߲߬߸ ߏ߬ ߟߎ߬ ߘߌ߫ ߟߊߡߊ߲߬ߘߌ߫ ߒ߬ߞߵߊ߬ߟߎ߬ ߢߡߊߘߏ߲߰ ߕߐ߫ ߦߋ߫ ߟߋ߬ ߞߊ߬ ߓߐ߫ ߦߋߟߌ
-          ߡߊ߬.
-        retain_notes: ߌ ߟߊ߫ ߔߊ߬ߔߘߊ ߦߟߌߣߐ ߟߎ߬ ߣߌ߫ ߦߟߌߣߐ ߟߎ߬ ߡߙߌߣߊ߲ ߠߎ߬߸ ߣߴߏ߬ ߟߎ߬ ߞߍ߫
-          ߘߊ߫ ߦߋ߲߬߸ ߏ߬ ߟߎ߬ ߘߌ߫ ߟߊߡߊ߲߬ߘߌ߫ ߒ߬ߞߵߊ߬ߟߎ߬ ߢߡߊߘߏ߲߰ ߕߐ߫ ߦߋ߫ ߟߋ߬ ߞߊ߬ ߓߐ߫ ߦߋߟߌ
-          ߡߊ߬.
-        retain_changeset_discussions: ߌ ߟߊ߫ ߘߊߘߐߖߊߥߏ ߟߎ߬ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߙߎ ߟߎ߬ ߞߊ߲߬߸
-          ߣߴߏ߬ ߟߎ߬ ߞߍ߫ ߘߊ߫ ߦߋ߲߬߸ ߏ߬ ߟߎ߬ ߘߌ߫ ߟߊߡߊ߲߬ߘߌ߫.
-        retain_email: ߌ ߟߊ߫ ߢߎߡߍߙߋ߲ߞߏ߲ߘߏ ߘߌ߫ ߟߊߡߊ߲߬ߘߌ߫.
-        confirm_delete: ߌ ߘߍ߲߬ߞߣߍ߬ߦߊ߬ߣߍ߲߫؟
-        cancel: ߊ߬ ߘߐߛߊ߬
   accounts:
     edit:
       title: ߖߊ߬ߕߋ߬ߘߊ ߡߊߦߟߍ߬ߡߊ߲߬
@@ -234,14 +202,6 @@ nqo:
       external auth: ߞߐߞߊ߲ߠߊ ߕߎ߬ߡߊ߬ߢߐ߲߰ߦߊ߬ߟߌ
       openid:
         link text: ߡߎ߲߬ ߦߋ߫ ߣߌ߲߬ ߘߌ߫؟
-      public editing:
-        heading: ߖߊ߬ߡߊ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲
-        enabled: ߓߘߊ߫ ߓߌ߬ߟߴߊ߬ ߟߊ߫. ߊ߬ ߕߍ߫ ߘߋ߬ ߞߏ߫ ߕߐ߯ߒߕߊ߲ ߛߋ߫ ߕߐ߫ ߓߍ߫ ߟߐ߲ߕߊ ߡߊߦߟߍ߬ߡߊ߲߫
-          ߠߊ߫.
-        enabled link text: ߣߌ߲߬ ߦߋ߫ ߡߎ߲߬ ߘߌ߫؟
-        disabled: ߊ߬ ߓߘߊ߫ ߓߴߊ߬ ߟߊ߫ ߊ߬ ߘߏ߲߬ ߕߍ߫ ߛߋ߫ ߟߐ߲ߕߊ ߡߊߦߟߍ߬ߡߊ߲߫ ߠߊ߫߸ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲
-          ߛߎ߯-ߎ-ߛߎ߫ ߞߐ߲߬ߣߍ߲߫ ߦߋ߫ ߢߍ ߘߐ߫߸ ߏ߬ ߓߍ߯ ߦߋ߫ ߕߐ߯ߒߕߊ߲ ߠߋ߬ ߘߌ߫.
-        disabled link text: ߡߎ߲߬ߠߊ߫ ߒߠߋ ߕߍ߫ ߛߋ߫ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߫ ߞߍ߫ ߟߊ߫؟
       contributor terms:
         heading: ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ ߛߙߊߕߌ ߟߎ߬
         agreed: ߌ ߓߘߊ߫ ߘߌ߬ߢߍ߫ ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ߠߊ߫ ߞߎߘߊ ߛߙߊߕߌ ߟߎ߬ ߡߊ߬.
@@ -272,6 +232,58 @@ nqo:
       success: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߞߌ߬ߓߊ߬ߙߏ߬ߦߊ ߓߘߊ߫ ߟߊߞߎߘߦߊ߫ ߞߏߟߌߞߏߟߌ߫.
     destroy:
       success: ߖߊ߬ߕߋ߬ߘߊ ߓߘߊ߫ ߖߏ߰ߛߌ߫.
+    deletions:
+      show:
+        title: ߒ ߠߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߖߏ߬ߛߌ߫
+        warning: ߖߊ߲߬ߓߌ߬ߟߊ߬ߟߌ߹ ߖߊ߬ߕߋ߬ߘߊ ߖߏ߬ߛߌ߬ߟߌ ߦߋ߫ ߟߊ߬ߞߎ߬ߙߊ߲߬ߠߌ߲ ߠߋ߬ ߘߌ߫߸ ߊ߬ ߘߏ߲߬
+          ߕߍ߫ ߣߊ߬ ߛߐ߲߬ ߠߊ߫ ߘߐߛߊ߬ ߟߊ߫.
+        delete_account: ߖߊ߬ߕߋ߬ߘߊ ߖߏ߬ߛߌ߫
+        delete_introduction: 'ߌ ߘߌ߫ ߛߴߌ ߟߊ߫ ߏߔߌ߲ߛߑߙߌߕߑߡߊߔ ߖߊ߬ߕߋ߬ߘߊ ߖߏ߬ߛߌ߫ ߟߊ߫ ߘߎ߰ߟߊ߬ߘߐ߬
+          ߞߘߎ ߟߊߓߊ߯ߙߊ ߟߊ߫. ߝߊߙߊ߲ߝߊ߯ߛߟߌ ߢߌ߲߬ ߠߎ߫ ߕߴߌ ߦߟߌ߫ ߟߊ߫ ߖߊ߰ߣߌ߲߫:'
+        delete_profile: ߌ ߟߊ߫ ߢߊߞߙߍ ߞߌ߬ߓߊ߬ߙߏ߬ߦߊ߸ ߞߊߕߘߍ߬ߕߍ߫ ߌ ߟߊ߫ ߊߝ߭ߊߙߑߕߊ߫ ߡߊ߬߸ ߌ
+          ߕߐ߯ߛߓߍߟߌ ߣߴߌ ߘߌ߲߬ߞߌߙߊ ߟߎ߬ ߓߍ߯ ߘߌ߫ ߛߋ߲߬ߓߐ߫.
+        delete_display_name: ߌ ߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ߬ ߕߐ߮ ߘߌ߫ ߛߋ߲߬ߓߐ߫߸ ߊ߬ ߝߊ߲߭ ߘߌ߫ ߛߋ߫ ߟߊߓߊ߯ߙߊ߫
+          ߟߊ߫ ߞߎߘߊ߫ ߘߌ߫ ߖߊ߬ߕߋ߬ߘߊ߫ ߜߘߍ ߟߎ߬ ߓߟߏ߫.
+        retain_caveats: ߏ߬ ߓߟߏߡߊ߬߸ ߌ ߞߌ߬ߓߊ߬ߙߏ߬ߦߊ ߘߏ߫ ߟߎ߫ ߘߌ߫ ߣߊ߬ ߟߊߡߊ߲߲߬ߘߌ߫ ߏߔߌ߲ߛߑߙߌߕߑߡߊߔ
+          ߟߊ߫߸ ߤߊߟߴߌ ߟߊ߫ ߖߊ߬ߕߋ߬ߘߊ ߖߏ߬ߛߌ ߞߐ ߘߐ߫.
+        retain_edits: ߌ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬ ߔߊ߬ߔߘߊ ߟߐ߲ߕߊ ߝߊ߲ ߠߊ߫߸ ߣߴߏ߬ ߞߍ߫ ߘߊ߫
+          ߦߋ߲߬߸ ߏ߬ ߟߎ߬ ߘߌ߫ ߣߊ߬ ߟߊߡߊ߲߲߬ߘߌ߫.
+        retain_traces: ߌ ߟߊ߫ ߜߙߋ߬ ߟߊߦߟߍ߬ߣߍ߲ ߠߎ߬߸ ߣߴߏ߬ ߞߍ߫ ߘߊ߫ ߦߋ߲߬߸ ߏ߬ ߟߎ߬ ߘߌ߫ ߟߊߡߊ߲߬ߘߌ߫.
+        retain_diary_entries: ߌ ߟߊ߫ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߠߎ߬ ߣߌ߫ ߡߙߌߣߊ߲ ߠߎ߬߸ ߣߴߏ߬ ߞߍ߫
+          ߘߊ߫ ߦߋ߲߬߸ ߏ߬ ߟߎ߬ ߘߌ߫ ߟߊߡߊ߲߬ߘߌ߫ ߒ߬ߞߵߊ߬ߟߎ߬ ߢߡߊߘߏ߲߰ ߕߐ߫ ߦߋ߫ ߟߋ߬ ߞߊ߬ ߓߐ߫ ߦߋߟߌ
+          ߡߊ߬.
+        retain_notes: ߌ ߟߊ߫ ߔߊ߬ߔߘߊ ߦߟߌߣߐ ߟߎ߬ ߣߌ߫ ߦߟߌߣߐ ߟߎ߬ ߡߙߌߣߊ߲ ߠߎ߬߸ ߣߴߏ߬ ߟߎ߬ ߞߍ߫
+          ߘߊ߫ ߦߋ߲߬߸ ߏ߬ ߟߎ߬ ߘߌ߫ ߟߊߡߊ߲߬ߘߌ߫ ߒ߬ߞߵߊ߬ߟߎ߬ ߢߡߊߘߏ߲߰ ߕߐ߫ ߦߋ߫ ߟߋ߬ ߞߊ߬ ߓߐ߫ ߦߋߟߌ
+          ߡߊ߬.
+        retain_changeset_discussions: ߌ ߟߊ߫ ߘߊߘߐߖߊߥߏ ߟߎ߬ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߬ ߞߙߎ ߟߎ߬ ߞߊ߲߬߸
+          ߣߴߏ߬ ߟߎ߬ ߞߍ߫ ߘߊ߫ ߦߋ߲߬߸ ߏ߬ ߟߎ߬ ߘߌ߫ ߟߊߡߊ߲߬ߘߌ߫.
+        retain_email: ߌ ߟߊ߫ ߢߎߡߍߙߋ߲ߞߏ߲ߘߏ ߘߌ߫ ߟߊߡߊ߲߬ߘߌ߫.
+        confirm_delete: ߌ ߘߍ߲߬ߞߣߍ߬ߦߊ߬ߣߍ߲߫؟
+        cancel: ߊ߬ ߘߐߛߊ߬
+    terms:
+      show:
+        title: ߛߙߊߕߌ ߟߎ߬
+        heading: ߛߙߊߕߌ ߟߎ߬
+        heading_ct: ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ ߛߙߊߕߌ ߟߎ߬
+        read_ct: ߒ ߓߘߊ߫ ߛߊ߲ߝߍ߫ ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ ߛߙߊߕߌ ߟߎ߬ ߘߐߞߊ߬ߙߊ߲߬ ߊ߬ ߣߌ߫ ߞߊ߬ ߘߌ߬ߢߍ߬
+          ߊ߬ ߡߊ߬ ߝߣߊ߫.
+        read_tou: ߒ ߓߘߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ ߛߙߊߕߌ ߘߐߞߊ߬ߙߊ߲߬ ߊ߬ ߣߌ߫ ߞߊ߬ ߘߌ߬ߢߍ߬ ߊ߬ ߡߊ߬
+        consider_pd: ߛߊ߲ߝߍߟߊ ߏ߬ ߡߊߞߊ߬ߝߏ߬ߟߌ ߘߐ߫ ߌ ߞߐ߫߸ ߒ ߧߋ߫ ߒ ߠߊ߫ ߓߟߏߡߊߜߍ߲ ߖߊ߬ߕߋ߬
+          ߟߴߊ߬ ߞߍ ߘߐ߫ ߖߊ߬ߡߊ ߘߍ߬ߒ߬ߡߊ߬ߝߋ߲ ߘߌ߫
+        consider_pd_why: ߣߌ߲߬ ߦߋ߫ ߡߎ߲߬ ߘߌ߫؟
+        continue: ߊ߬ ߘߊߓߊ߲߫
+        legale_select: 'ߌ ߛߌ߰ߣߍ߲߬ ߦߋ߫ ߖߡߊ߬ߣߊ ߡߍ߲ ߘߐ߫:'
+        legale_names:
+          france: ߝߊ߬ߙߊ߲߬ߛߌ߫
+          italy: ߌߕߊߟߌ߫
+          rest_of_world: ߘߎߢߊ߫ ߕߐ߬ ߕߏߣߍ߲
+      update:
+        terms accepted: ߌ ߣߌ߫ ߗߋ߫ ߓߟߏߡߊߜߍ߲ ߛߙߊߕߌ߫ ߞߎߘߊ ߟߊߡߌ߬ߘߊ ߟߊ߫߹
+      terms_declined_flash:
+        terms_declined_html: ߊ߲ ߓߘߊ߫ ߖߌ߰ߡߊߖߊ߲߬ߝߊ߫ ߞߊ߬ ߓߍ߲߬ ߌ ߓߊ߲߭ ߡߊ߬ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫
+          ߞߎߘߊ ߞߎߘߊ ߛߙߊߕߌ ߟߊߡߌ߬ߣߊ߫ ߟߊ߫. ߛߴߌ ߘߌ߫ ߞߎ߲߬ߠߊ߬ߝߏ߬ߣߌ߲߫ ߛߌߦߊߡߊ߲߫ ߞߏ ߘߐ߫߸ %{terms_declined_link}
+          ߘߐߜߍ߫ ߖߊ߰ߣߌ߲߫.
+        terms_declined_link: ߥߞߌ߫ ߞߐߜߍ ߣߌ߲߬
   browse:
     deleted_ago_by_html: ߖߏ߰ߛߌ߬ߣߍ߲߬ ߦߋ߫ %{time_ago} ߟߋ߬ ߟߊ߫ %{user} ߓߟߏ߫
     edited_ago_by_html: ߡߊߙߟߍ߬ߡߊ߲߬ߣߍ߲߬ ߦߋ߫ %{time_ago} ߟߋ߬ ߟߊ߫ %{user} ߓߟߏ߫
@@ -286,14 +298,11 @@ nqo:
     location: ߘߌ߲߬ߞߌߙߊ
     node:
       title_html: 'ߥߎߙߋ߲ߛߋ߲: %{name}'
-      history_title_html: 'ߥߎߙߋ߲ߛߋ߲ ߘߐ߬ߝߐ: %{name}'
     way:
       title_html: 'ߛߌߟߊ: %{name}'
-      history_title_html: 'ߛߌߟߊ ߘߐ߬ߝߐ: %{name}'
       nodes: ߥߎߙߋ߲ߛߋ߲ ߠߎ߬
     relation:
       title_html: 'ߕߍߓߊ߯ߦߊ: %{name}'
-      history_title_html: 'ߕߍߓߊ߯ߦߊ ߟߊ߫ ߘߐ߬ߝߐ: %{name}'
       members: ߛߌ߲߬ߝߏ߲ ߠߎ߬
     relation_member:
       entry_role_html: '%{type} %{name} %{role} ߘߌ߫'
@@ -305,13 +314,6 @@ nqo:
       entry_role_html: ߕߍߓߊ߯ߦߊ %{relation_role} %{relation_name} ߘߌ߫
     not_found:
       title: ߡߊ߫ ߛߐ߬ߘߐ߲߫
-      sorry: 'ߤߊߞߍ߬ߕߏ߫߸ %{type} #%{id} ߕߍߣߊ߬ ߛߐ߬ߘߐ߲߬ ߠߊ߫.'
-      type:
-        node: ߘߐ߬ߞߌߛߍ
-        way: ߛߌߟߊ
-        relation: ߕߍߓߊ߯ߦߊ
-        changeset: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
-        note: ߦߟߌߣߐ
     timeout:
       title: ߕߎ߬ߡߊ ߓߊ߲ߠߌ߲ ߝߎ߬ߕߎ߲߬ߕߌ
       sorry: ߤߊߞߍ߬ߕߏ߫߸ %{type} ߕߊ߫ ߓߟߏߡߟߊ ߡ.ߟ %{id} ߘߌ߫߸ ߊ߬ ߓߘߊ߫ ߥߛߎ߬ߖߊ߲߫ ߕߵߊ߬ ߡߊߝߍߣߍ߲
@@ -349,6 +351,14 @@ nqo:
       introduction: ߡߊߔ ߛߐ߲߬ߞߌ߲߫ ߞߊ߬ ߌ ߡߊߛߘߎ߬ߧߊ߬ ߟߊߓߊ߯ߙߊߟߌ ߟߎ߫ ߢߌߣߌ߲߫.
       nearby: ߕߙߐ߬ߝߍ߬ ߟߊߓߊ߯ߙߊߟߌ
       enclosing: ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ߫ ߡߊߛߎ߬ߘߎ߲߬ߧߊ߬ߣߍ߲ ߠߎ߬
+  old_elements:
+    index:
+      node:
+        title_html: 'ߥߎߙߋ߲ߛߋ߲ ߘߐ߬ߝߐ: %{name}'
+      way:
+        title_html: 'ߛߌߟߊ ߘߐ߬ߝߐ: %{name}'
+      relation:
+        title_html: 'ߕߍߓߊ߯ߦߊ ߟߊ߫ ߘߐ߬ߝߐ: %{name}'
   changeset_comments:
     feeds:
       comment:
@@ -370,7 +380,6 @@ nqo:
       title: ߟߊ߬ߘߏ߲߬ߠߌ߲ ߠߎ߬ ߡߊߝߊ߬ߟߋ߲߫
       title_user: '%{user} ߓߘߊ߫ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫'
       title_user_link_html: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲߫ ߞߙߎ %{user_link} ߓߟߏ߫
-      title_friend: ߒ ߕߋߙߌ ߓߘߊ߫ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߡߊߝߊ߬ߟߋ߲߫
       title_nearby: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߡߍ߲ ߟߊߘߏ߲߬ߣߍ߲߫ ߛߌ߬ߢߐ߲߰ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߎ߬ ߓߟߏ߫
       empty: ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲߬ ߡߊ߫ ߛߐ߬ߘߐ߲߫
       empty_area: ߟߊ߬ߘߏ߲߬ߠߌ߲߬ ߡߊ߬ߝߊ߬ߟߋ߲߬ߠߌ߲߬ ߕߍ߫ ߕߌ߲߬ߞߎߘߎ߲ ߘߐ߫.
@@ -421,15 +430,10 @@ nqo:
     popup:
       your location: ߌ ߘߌ߲߬ߞߌߙߊ
       nearby mapper: ߛߌ߰ߢߐ߲߮ ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߊ
-      friend: ߕߋߙߌ
     show:
       edit_your_profile: ߌ ߢߊߞߙߍ ߡߊߦߟߍ߬ߡߊ߲߫
-      my friends: ߒ ߕߋߙߌ ߟߎ߬
-      no friends: ߌ ߡߊ߫ ߕߋߙߌ߫ ߛߌ߫ ߝߙߊ߬ ߡߎߣߎ߲߬.
       nearby users: ߛߌ߰ߢߐ߲߮ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߜߘߍ ߟߎ߬
       no nearby users: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߜߘߍ߫ ߛߌ߫ ߟߊߞߙߐ߬ߛߌ߫ ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߊ ߘߴߌ ߕߙߐߝߍ߬ ߡߎߣߎ߲߬.
-      friends_changesets: ߕߋߙߌ ߟߎ߬ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬
-      friends_diaries: ߕߋߙߌ ߟߎ߬ ߟߊ߫ ߕߋ߬ߟߋ߲ ߓߊ߯ߙߊ ߟߎ߬
       nearby_changesets: ߞߙߍ߬ߝߍ߬ ߕߋߙߌ ߟߎ߬ ߟߊ߫ ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬
       nearby_diaries: ߛߌ߰ߢߐ߲߰ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߊ߫ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߬ߠߌ߲߬ߣߐ ߟߎ߬
   diary_entries:
@@ -440,7 +444,6 @@ nqo:
       use_map_link: ߔߊ߬ߔߘߊ ߟߊߓߊ߯ߙߊ߫
     index:
       title: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߎ߬ ߕߋ߬ߟߋ߲
-      title_friends: ߕߋߙߌ ߟߎ߬ ߕߋ߬ߟߋ߲
       title_nearby: ߛߌ߰ߢߐ߲߮ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߎ߬ ߕߋ߬ߟߋ߲
       user_title: '%{user} ߕߋ߬ߟߋ߲'
       in_language_title: '%{language} ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߠߎ߬'
@@ -493,16 +496,6 @@ nqo:
       all:
         title: ߏߔߌ߲ߛߕߑߙߌߕߑߡߊߔ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߠߎ߬
         description: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߊ߫ ߕߋ߬ߟߋ߲ ߟߊ߬ߘߏ߲߬ߠߌ߲ ߏߔߌ߲ߛߕߑߙߌߕߑߡߊߔ ߞߊ߲߬
-  diary_comments:
-    index:
-      title: ߕߋ߬ߟߋ߲ ߡߙߌߣߊ߲߲߫ ߝߙߊ߬ߣߍ߲ %{user} ߓߟߏ߫
-      heading: '%{user} ߟߊ߫ ߕߋ߬ߟߋ߲ ߡߙߌߣߊ߲߲ ߠߎ߬'
-      subheading_html: ߕߋ߬ߟߋ߲ ߡߙߌߣߊ߲߲ ߝߙߊ߬ߣߍ߲ %{user} ߓߟߏ߫
-      no_comments: ߕߋ߬ߟߋ߲ ߡߙߌߣߊ߲߲߫ ߕߴߦߋ߲߬
-    page:
-      post: ߗߋߓߏ߲
-      when: ߕߎ߬ߡߊ߫ ߖߐ߲߬
-      comment: ߡߙߌߣߊ߲ߦߌߘߊ
   doorkeeper:
     flash:
       applications:
@@ -517,20 +510,6 @@ nqo:
       title: ߟߥߊ߬ߟߌ߬ߟߌ ߝߎ߬ߕߎ߲߬ߕߌ
     not_found:
       title: ߞߐߕߐ߮ ߡߊ߬ ߛߐ߬ߘߐ߲߬
-  friendships:
-    make_friend:
-      heading: ' ߞߊ߬ %{user} ߞߍ߫ ߌ ߕߋߙߌ ߘߌ߫؟'
-      button: ߞߍ߫ ߕߋߙߌ ߘߌ߫
-      success: '%{name} ߓߘߊ߫ ߞߴߌ ߕߋߙߌ ߘߌ߫߹'
-      failed: ߤߊߞߍ߬ߕߏ߫߸ %{name} ߓߘߊ߫ ߗߌߙߏ߲߫ ߝߊ߬ߙߊ ߘߐ߫ ߕߋߙߌ ߟߎ߬ ߟߊ߫
-      already_a_friend: ߌ ߕߋߙߌ ߟߋ߬ ߦߋ߫ %{name} ߘߌ߫ ߞߘߐ߬ߡߊ߲߫
-      limit_exceeded: ߌ ߓߊ߲߫ ߛߊ߲߮ ߠߋ߬ ߦߋ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߥߙߍߓߊߓߊ ߞߍ߫ ߟߴߌ ߕߋߙߌ ߘߌ߫ ߣߌ߲߬.
-        ߒ߬ߓߊ߬ ߥߛߎ߬ߣߍ߲߫ ߘߐߞߐ߬ߣߐ߲߫ ߖߊ߰ߣߌ߲߫ ߦߊ߬ߣߴߌ ߞߍߕߐ߫ ߦߋ߫ ߕߋߙߌ߫ ߜߘߍ߫ ߟߊߘߊ߲߫ ߠߊ߫.
-    remove_friend:
-      heading: ߡߍ߲ ߕߴߌ ߕߋߙߌ߫ ߘߌ߫ %{user}؟
-      button: ߌ ߕߋߙߌ߫ ߕߍ߫
-      success: '%{name} ߓߘߊ߫ ߓߊ߲߫ ߓߐ߫ ߟߴߌ ߕߋߙߌߦߊ ߟߊ߫'
-      not_a_friend: '%{name} ߕߴߌ ߕߋߙߌ ߝߋ߲߫ ߘߌ߫.'
   geocoder:
     search:
       title:
@@ -999,7 +978,6 @@ nqo:
       last_updated: ߟߏ߲ߘߐߦߊߟߌ ߞߐ߯ߟߕߊ
       reported_item: ߝߛߌ߬ ߟߊߞߏߝߐߣߍ߲
     show:
-      title: '%{status} ߝߌ߬ߛߌ #%{issue_id}'
       report_created_at_html: ߞߏߝߐߟߌ߫ ߝߟߐ ߞߍ߫ ߘߊ߫ %{datetime}
       last_resolved_at_html: ߢߊߓߐߟߌ߫ ߟߊߓߊ߲ ߞߍ߫ ߘߊ߫ %{datetime}
       last_updated_at_html: ߊ߬ ߟߊߛߋ߫ ߟߊߓߊ߲ ߞߍ߫ ߘߊ߫ ߘߊߞߎ߲ ߘߐ߫ %{datetime} ߊ߬ ߣߌ߫ %{displayname}
@@ -1098,15 +1076,10 @@ nqo:
         ߟߴߊ߬ ߛߓߍߓߊ߮ ߡߊ߬ %{replyurl} ߟߊ߫
       footer_html: ߌ ߘߌ߫ ߛߋ߫ ߗߋߛߓߍ ߘߐߞߊ߬ߙߊ߲߬ ߠߊ߫ %{readurl} ߟߊ߫ ߊ߬ ߣߴߌ ߘߌ߫ ߛߋ߫ ߗߋߛߓߍ
         ߗߋ߫ ߟߴߊ߬ ߛߓߍߓߊ߮ ߡߊ߬ %{replyurl} ߟߊ߫
-    friendship_notification:
+    follow_notification:
       hi: '%{to_user} ߣߌ߫ ߕߎ߬ߡߊ߬'
-      subject: '[ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ] %{user} ߓߘߴߌ ߝߙߊ߬ ߕߋߙߌ ߟߎ߬ ߟߊ߫'
-      had_added_you: '%{user} ߓߘߴߌ ߝߙߊ߬ ߕߋߙߌ ߟߎ߬ ߟߊ߫ ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ ߞߊ߲߬.'
       see_their_profile: ߌ ߘߌ߫ ߛߴߊ߬ߟߎ߬ ߢߊߞߙߍ ߦߋ߫ ߟߊ߫ ߦߊ߲߬ %{userurl}.
       see_their_profile_html: ߌ ߘߌ߫ ߛߴߊ߬ߟߎ߬ ߢߊߞߙߍ ߦߋ߫ ߟߊ߫ ߦߊ߲߬ %{userurl}.
-      befriend_them: ߌ ߝߣߊ߫ ߘߌ߫ ߛߴߊ߬ߟߎ߫ ߝߙߊ߬ ߟߊ߫ ߕߋߙߌ ߟߎ߬ ߟߊ߫ %{befriendurl} ߘߐ߫
-      befriend_them_html: ߌ ߘߌ߫ ߛߴߊ߬ߟߎ߫ ߝߙߊ߬ ߟߊ߫ ߕߋߙߌ ߟߎ߬ ߟߊ߫ ߝߣߊ߫ %{befriendurl}
-        ߘߐ߫
     gpx_failure:
       hi: '%{to_user} ߣߌ߫ ߕߎ߬ߡߊ߬'
       failed_to_import: 'ߟߊ߬ߛߣߍ߬ߟߌ߬ ߗߌߙߏ߲ߣߍ߲. ߝߎ߬ߕߎ߲߬ߕߌ ߦߋ߫ ߦߊ߲߬:'
@@ -1200,21 +1173,6 @@ nqo:
       failure: ߢ:ߞߏ߲ߘߏ ߘߏ߫ ߓߘߊ߫ ߟߊߛߙߋߦߊ߫ ߖߐߟߐ߲ߞߐ (ߥߏߘߌߜߊߠߊ߲) ߣߌ߲߬ ߠߊ߫ ߞߘߐ߬ߡߊ߲߫.
       unknown_token: ߟߊ߬ߛߙߋ߬ߦߊ߬ߟߌ߬ ߘߏߞߊ߲ ߣߌ߲߬ ߛߕߊ ߓߘߊ߫ ߝߊ߫ ߥߟߴߊ߬ ߕߴߦߋ߲߬.
   messages:
-    inbox:
-      title: ߗߋߛߓߍ߫ ߟߊߣߊ߬ߣߍ߲
-      messages: '%{new_messages} ߟߎ߬ ߣߌ߫ %{old_messages} ߠߎ߬ ߦߴߌ ߓߟߏ߫'
-      no_messages_yet_html: ߗߋߛߓߍ߫ ߕߴߌ ߓߟߏ߫ ߡߎߣߎ߲߬. ߡߎ߲߬ߠߊ߫ ߌ ߡߊ߫ ߕߘߍ߬ ߡߊ߰ߒ߬ߠߊ߬ߟߌ
-        ߘߐ߫  %{people_mapping_nearby_link} ߟߊ߫؟
-      people_mapping_nearby: ߛߌ߰ߢߐ߰ߡߊ ߡߍ߲ ߠߎ߬ ߦߋ߫ ߔߊ߬ߔߘߊ߬ߦߊ ߞߊ߲߬
-    messages_table:
-      from: ߞߊ߬ ߝߘߊ߫
-      to: ߞߊ߬ ߕߊ߯
-      subject: ߝߐߡߊ
-      date: ߕߎ߬ߡߊ߬ߘߊ
-    message_summary:
-      unread_button: ߊ߬ ߞߍ߫ ߞߊ߬ߙߊ߲߬ߓߊߟߌ ߘߌ߫
-      read_button: ߊ߬ ߣߐ߬ߣߐ߫ ߘߐ߬ߞߊ߬ߙߊ߲߬ߣߍ߲ ߘߌ߫
-      destroy_button: ߊ߬ ߖߏ߬ߛߌ߬
     new:
       title: ߗߋߛߓߍ ߗߋ߫
       send_message_to_html: ߗߋߛߓߍ߫ ߞߎߘߊ ߘߏ߫ ߗߋ߫ %{name} ߡߊ߬
@@ -1227,15 +1185,6 @@ nqo:
       title: ߗߋߛߓߍ߫ ߛߎ߮ ߏ߬ ߕߴߦߋ߲߬
       heading: ߗߋߛߓߍ߫ ߛߎ߮ ߏ߬ ߕߴߦߋ߲߬
       body: ߤߊߞߍ߬ߕߏ߫߸ ߗߋߛߓߍ߫ ߛߌ߫ ߕߍ߫ ߛߊ߲߬ߓߊ߬ߕߐ߮ ߏ߬ ߟߊ߫.
-    outbox:
-      title: ߗߋߟߌ߫ ߞߏ߲ߘߏ
-      no_sent_messages_html: ߗߋߛߓߍ߫ ߗߋߣߍ߲߫ ߕߴߌ ߓߟߏ߫ ߡߎߣߎ߲߬. ߡߎ߲߬ߠߊ߫ ߌ ߡߊ߫ ߕߘߍ߬ ߓߌ߬ߟߊ߬ߒ߬ߡߊ߬ߟߌ
-        ߘߐ߫ %{people_mapping_nearby_link}؟
-      people_mapping_nearby: ߡߐ߱ ߡߍ߲ ߠߎ߬ ߦߋ߫ ߔߊ߬ߔߘߊ߬ߦߊ ߞߊ߲߬ ߌ ߕߙߐߝߍ߬
-    reply:
-      wrong_user: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲߬ ߦߋ߫ %{user} ߟߋ߬ ߘߌ߫ ߒ߬ߞߊ߬ ߌ ߢߌ߬ߣߊ߬ߣߍ߲߫ ߗߋߛߓߍ ߡߍ߲  ߖߋ߬ߓߌ߬ߞߏ
-        ߡߊ߬߸ ߏ߬ ߗߋߣߍ߲߫ ߕߍ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߏ߬ ߡߊ߬. ߌ ߜߊ߲߬ߞߎ߲߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߖߐ߲ߖߐ߲ ߘߌ߫
-        ߖߊ߰ߣߌ߲߫ ߛߴߌ ߘߌ߫ ߛߴߊ߬ ߖߋ߬ߓߌ߬ ߟߊ߫.
     show:
       title: ߗߋߛߓߍ ߘߐߞߊ߬ߙߊ߲߬
       reply_button: ߊ߬ ߞߐߖߋ߬ߓߌ߬
@@ -1245,16 +1194,44 @@ nqo:
       wrong_user: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲߬ ߦߋ߫ %{user} ߟߋ߬ ߘߌ߫ ߒ߬ߞߊ߬ ߌ ߢߌ߬ߣߊ߬ߣߍ߲߫ ߗߋߛߓߍ ߡߍ߲
         ߘߐߞߊ߬ߙߊ߲߬ ߞߏ ߡߊ߬߸ ߏ߬ ߗߋߣߍ߲߫ ߕߴߏ߬ ߓߟߏ߫ ߥߟߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߏ߬ ߡߊ߬. ߌ ߜߊ߲߬ߞߎ߲߫
         ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߖߐ߲ߖߐ߲ ߘߌ߫ ߖߊ߰ߣߌ߲߫ ߛߴߌ ߘߌ߫ ߛߴߊ߬ ߘߐߞߊ߬ߙߊ߲߬ ߠߊ߫.
-    sent_message_summary:
-      destroy_button: ߊ߬ ߖߏ߬ߛߌ߬
-    heading:
-      my_inbox: ߒ ߠߊ߫ ߞߏ߲߬ߘߏ ߞߣߐߟߊ
-      my_outbox: ߒ ߠߊ߫ ߗߋߛߓߍ߫ ߗߋߣߍ߲
     mark:
       as_read: ߗߋߛߓߍ ߓߘߊ߫ ߣߐ߫ߣߐ߫ ߘߐ߬ߞߊ߬ߙߊ߲߬ߣߍ߲ ߘߌ߫
       as_unread: ߗߋߛߓߍ ߓߘߊ߫ ߣߐ߬ߣߐ߬ ߞߊ߬ߙߊ߲߬ߓߊߟߌ ߘߌ߫
     destroy:
       destroyed: ߗߋߛߓߍ ߓߘߊ߫ ߖߏ߬ߛߌ߫
+    mailboxes:
+      heading:
+        my_inbox: ߒ ߠߊ߫ ߞߏ߲߬ߘߏ ߞߣߐߟߊ
+        my_outbox: ߒ ߠߊ߫ ߗߋߛߓߍ߫ ߗߋߣߍ߲
+      messages_table:
+        from: ߞߊ߬ ߝߘߊ߫
+        to: ߞߊ߬ ߕߊ߯
+        subject: ߝߐߡߊ
+        date: ߕߎ߬ߡߊ߬ߘߊ
+      message:
+        unread_button: ߊ߬ ߞߍ߫ ߞߊ߬ߙߊ߲߬ߓߊߟߌ ߘߌ߫
+        read_button: ߊ߬ ߣߐ߬ߣߐ߫ ߘߐ߬ߞߊ߬ߙߊ߲߬ߣߍ߲ ߘߌ߫
+        destroy_button: ߊ߬ ߖߏ߬ߛߌ߬
+    inboxes:
+      show:
+        title: ߗߋߛߓߍ߫ ߟߊߣߊ߬ߣߍ߲
+        messages: '%{new_messages} ߟߎ߬ ߣߌ߫ %{old_messages} ߠߎ߬ ߦߴߌ ߓߟߏ߫'
+        no_messages_yet_html: ߗߋߛߓߍ߫ ߕߴߌ ߓߟߏ߫ ߡߎߣߎ߲߬. ߡߎ߲߬ߠߊ߫ ߌ ߡߊ߫ ߕߘߍ߬ ߡߊ߰ߒ߬ߠߊ߬ߟߌ
+          ߘߐ߫  %{people_mapping_nearby_link} ߟߊ߫؟
+        people_mapping_nearby: ߛߌ߰ߢߐ߰ߡߊ ߡߍ߲ ߠߎ߬ ߦߋ߫ ߔߊ߬ߔߘߊ߬ߦߊ ߞߊ߲߬
+    outboxes:
+      show:
+        title: ߗߋߟߌ߫ ߞߏ߲ߘߏ
+        no_sent_messages_html: ߗߋߛߓߍ߫ ߗߋߣߍ߲߫ ߕߴߌ ߓߟߏ߫ ߡߎߣߎ߲߬. ߡߎ߲߬ߠߊ߫ ߌ ߡߊ߫ ߕߘߍ߬ ߓߌ߬ߟߊ߬ߒ߬ߡߊ߬ߟߌ
+          ߘߐ߫ %{people_mapping_nearby_link}؟
+        people_mapping_nearby: ߡߐ߱ ߡߍ߲ ߠߎ߬ ߦߋ߫ ߔߊ߬ߔߘߊ߬ߦߊ ߞߊ߲߬ ߌ ߕߙߐߝߍ߬
+      message:
+        destroy_button: ߊ߬ ߖߏ߬ߛߌ߬
+    replies:
+      new:
+        wrong_user: ߌ ߜߊ߲߬ߞߎ߲߬ߣߍ߲߬ ߦߋ߫ %{user} ߟߋ߬ ߘߌ߫ ߒ߬ߞߊ߬ ߌ ߢߌ߬ߣߊ߬ߣߍ߲߫ ߗߋߛߓߍ ߡߍ߲  ߖߋ߬ߓߌ߬ߞߏ
+          ߡߊ߬߸ ߏ߬ ߗߋߣߍ߲߫ ߕߍ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߏ߬ ߡߊ߬. ߌ ߜߊ߲߬ߞߎ߲߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߖߐ߲ߖߐ߲ ߘߌ߫
+          ߖߊ߰ߣߌ߲߫ ߛߴߌ ߘߌ߫ ߛߴߊ߬ ߖߋ߬ߓߌ߬ ߟߊ߫.
   passwords:
     new:
       title: ߓߣߐ߬ ߓߘߊ߫ ߞߍ߫ ߕߊ߬ߡߌ߲߬ߞߊ߲ ߘߐ߫
@@ -1273,13 +1250,7 @@ nqo:
   preferences:
     show:
       title: ߒ ߠߊ߫ ߦߟߌߡߊߛߙߋ ߟߎ߬
-      preferred_editor: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߊ ߝߌ߬ߛߊ߬ߡߊ߲߬ߕߋ
-      preferred_languages: ߞߊ߲߫ ߝߌ߬ߛߊ߬ߡߊ߲߬ߕߋ ߟߎ߬
-      edit_preferences: ߦߟߌߡߊߛߙߋ ߡߊߦߟߍ߬ߡߊ߲߫
-    edit:
-      title: ߦߟߌߡߊߛߙߋ ߡߊߦߟߍ߬ߡߊ߲߫
       save: ߦߟߌߡߊߛߙߋ ߟߎ߬ ߟߊߞߎߘߦߊ߫
-      cancel: ߊ߬ ߘߐߛߊ߬
     update:
       failure: ߦߟߌߡߊߛߙߋ ߟߎ߬ ߕߍ߫ ߛߐ߲߬ ߟߊߞߎߘߦߊ߫ ߟߊ߫.
     update_success_flash:
@@ -1532,10 +1503,11 @@ nqo:
     offline:
       heading: GPX ߟߊߡߙߊ߬ߦߙߐ ߜߊ߲߬ߞߎ߲߬ߓߊߟߌ ߟߋ߬
       message: GPX ߞߐߕߐ߮ ߟߊߡߙߊ߬ߦߙߐ ߣߴߊ߬ ߟߊ߬ߦߟߍ߬ߟߌ߬ ߞߊ߲ߞߋ ߟߎ߬ ߕߴߊ߬ ߟߊ߫ ߕߊ߲߬.
-    georss:
-      title: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ GPS ߜߋ߬ߙߋ
-    description:
-      description_without_count: GPX ߞߐߕߐ߮ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫
+    feeds:
+      show:
+        title: ߏߔߌ߲ߛߑߕߙߌߕߑߡߊߔ GPS ߜߋ߬ߙߋ
+      description:
+        description_without_count: GPX ߞߐߕߐ߮ ߞߊ߬ ߝߘߊ߫ %{user} ߟߊ߫
   application:
     permission_denied: ߘߌ߬ߢߍ߬ ߞߍߣߍ߲߫ ߕߴߌ ߡߊ߬ ߞߏ߫ ߛߎ߮ ߏ߬ ߟߊߛߐ߬ߘߐ߲ ߘߐ߫
     require_cookies:
@@ -1627,28 +1599,6 @@ nqo:
       display name description: ߌ ߓߘߊ߫ ߕߐ߮ ߟߊߓߊ߯ߙߕߊ ߟߊߓߊ߯ߙߊ߫ ߖߊ߬ߡߊ ߢߊߞߘߐ߫.ߌ ߘߌ߫ ߛߴߏ߬
         ߡߊߝߊ߬ߟߋ߲߬ ߠߊ߫ ߦߟߌߡߊߛߙߋ ߞߣߐ߫ ߞߐߝߍ߬.
       continue: ߖߊ߬ߕߋ߬ߘߊ ߟߊߞߊ߬
-      terms accepted: ߌ ߣߌ߫ ߗߋ߫ ߓߟߏߡߊߜߍ߲ ߛߙߊߕߌ߫ ߞߎߘߊ ߟߊߡߌ߬ߘߊ ߟߊ߫߹
-    terms:
-      title: ߛߙߊߕߌ ߟߎ߬
-      heading: ߛߙߊߕߌ ߟߎ߬
-      heading_ct: ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ ߛߙߊߕߌ ߟߎ߬
-      read_ct: ߒ ߓߘߊ߫ ߛߊ߲ߝߍ߫ ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ ߛߙߊߕߌ ߟߎ߬ ߘߐߞߊ߬ߙߊ߲߬ ߊ߬ ߣߌ߫ ߞߊ߬ ߘߌ߬ߢߍ߬
-        ߊ߬ ߡߊ߬ ߝߣߊ߫.
-      read_tou: ߒ ߓߘߊ߫ ߟߊ߬ߓߊ߰ߙߊ߬ߟߌ ߛߙߊߕߌ ߘߐߞߊ߬ߙߊ߲߬ ߊ߬ ߣߌ߫ ߞߊ߬ ߘߌ߬ߢߍ߬ ߊ߬ ߡߊ߬
-      consider_pd: ߛߊ߲ߝߍߟߊ ߏ߬ ߡߊߞߊ߬ߝߏ߬ߟߌ ߘߐ߫ ߌ ߞߐ߫߸ ߒ ߧߋ߫ ߒ ߠߊ߫ ߓߟߏߡߊߜߍ߲ ߖߊ߬ߕߋ߬ ߟߴߊ߬
-        ߞߍ ߘߐ߫ ߖߊ߬ߡߊ ߘߍ߬ߒ߬ߡߊ߬ߝߋ߲ ߘߌ߫
-      consider_pd_why: ߣߌ߲߬ ߦߋ߫ ߡߎ߲߬ ߘߌ߫؟
-      continue: ߊ߬ ߘߊߓߊ߲߫
-      legale_select: 'ߌ ߛߌ߰ߣߍ߲߬ ߦߋ߫ ߖߡߊ߬ߣߊ ߡߍ߲ ߘߐ߫:'
-      legale_names:
-        france: ߝߊ߬ߙߊ߲߬ߛߌ߫
-        italy: ߌߕߊߟߌ߫
-        rest_of_world: ߘߎߢߊ߫ ߕߐ߬ ߕߏߣߍ߲
-    terms_declined_flash:
-      terms_declined_html: ߊ߲ ߓߘߊ߫ ߖߌ߰ߡߊߖߊ߲߬ߝߊ߫ ߞߊ߬ ߓߍ߲߬ ߌ ߓߊ߲߭ ߡߊ߬ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߞߎߘߊ
-        ߞߎߘߊ ߛߙߊߕߌ ߟߊߡߌ߬ߣߊ߫ ߟߊ߫. ߛߴߌ ߘߌ߫ ߞߎ߲߬ߠߊ߬ߝߏ߬ߣߌ߲߫ ߛߌߦߊߡߊ߲߫ ߞߏ ߘߐ߫߸ %{terms_declined_link}
-        ߘߐߜߍ߫ ߖߊ߰ߣߌ߲߫.
-      terms_declined_link: ߥߞߌ߫ ߞߐߜߍ ߣߌ߲߬
     no_such_user:
       title: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߛߎ߮ ߏ߬ ߕߍ߫ ߦߋ߲߬
       heading: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ %{user} ߕߍ߫ ߦߋ߲߬
@@ -1673,8 +1623,6 @@ nqo:
       edits: ߡߊ߬ߦߟߍ߬ߡߊ߲߬ߠߌ߲ ߠߎ߬
       traces: ߝߏ߲߬ߝߏ߲ ߠߎ߬
       notes: ߡߊߔ ߦߟߌߣߐ ߟߎ߬
-      remove as friend: ߕߋߙߌߦߊ ߝߘߊ߫
-      add as friend: ߕߋߙߌ ߝߙߊ߬
       mapper since: 'ߔߊ߬ߔߘߊ߬ߦߊ߬ߟߊ ߘߌ߫ ߞߊ߬ߦߌ߯:'
       ct status: 'ߓߟߏߓߌߟߊߢߐ߲߯ߞߊ߲ ߛߙߊߕߌ ߟߎ߬:'
       email address: 'ߢߎߡߍߙߋ߲߫ߞߏ߲ߘߏ ߛߊ߲߬ߓߊ߬ߕߐ߮:'
@@ -1689,15 +1637,26 @@ nqo:
       delete_user: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߖߏ߰ߛߌ߫
       confirm: ߊ߬ ߟߊߛߙߋߦߊ߫
       report: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߣߌ߲߬ ߠߊߞߏߝߐ߫
-    index:
-      title: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߎ߬
-      heading: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߎ߬
-      summary_html: '%{name} ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{ip_address} ߟߋ߬ ߡߊ߬ %{date} ߟߊ߫'
-      summary_no_ip_html: '%{name} ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{date} ߟߋ߬ ߟߊ߫'
-      empty: ߕߙߏ߬ߞߏ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߡߊ߫ ߛߐ߬ߘߐ߲߫
-    page:
-      confirm: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߓߊߕߐ߬ߡߐ߲߬ߣߍ߲ ߠߎ߬ ߟߊߛߙߋߦߊ߫
-      hide: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߓߊߕߐ߬ߡߐ߲߬ߣߍ߲ ߠߎ߬ ߢߡߊߘߏ߲߰
+    lists:
+      show:
+        title: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߎ߬
+        heading: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ ߟߎ߬
+        empty: ߕߙߏ߬ߞߏ ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߡߊ߫ ߛߐ߬ߘߐ߲߫
+      page:
+        confirm: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߓߊߕߐ߬ߡߐ߲߬ߣߍ߲ ߠߎ߬ ߟߊߛߙߋߦߊ߫
+        hide: ߟߊ߬ߓߊ߰ߙߊ߬ߟߊ߫ ߓߊߕߐ߬ߡߐ߲߬ߣߍ߲ ߠߎ߬ ߢߡߊߘߏ߲߰
+      user:
+        summary_html: '%{name} ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{ip_address} ߟߋ߬ ߡߊ߬ %{date} ߟߊ߫'
+        summary_no_ip_html: '%{name} ߛߌ߲ߘߌߣߍ߲߫ ߦߋ߫ %{date} ߟߋ߬ ߟߊ߫'
+    changeset_comments:
+      page:
+        when: ߕߎ߬ߡߊ߫ ߖߐ߲߬
+        comment: ߡߙߌߣߊ߲ߦߌߘߊ
+    diary_comments:
+      index:
+        title: ߕߋ߬ߟߋ߲ ߡߙߌߣߊ߲߲߫ ߝߙߊ߬ߣߍ߲ %{user} ߓߟߏ߫
+      page:
+        post: ߗߋߓߏ߲
     suspended:
       title: ߖߊ߬ߕߋ߬ߘߊ߬ ߟߊߘߎ߲ߣߍ߲
       heading: ߖߊ߬ߕߋ߬ߘߊ߬ ߟߊߘߎ߲ߣߍ߲