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

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

diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index d2cb1a0d7d8e2d8d8c975c06d98c06ddf3d9c2c6..fb427ed07b79958753c1d3b01d8141d9b092ed39 100644 (file)
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -376,6 +376,7 @@ kab:
     contact:
       km away: '%{count} km'
       m away: yebɛed s %{count} m
+      latest_edit_html: 'Asnifel aneggaru %{ago} :'
     popup:
       your location: Adig-ik
       friend: Amdakkel
@@ -939,17 +940,18 @@ kab:
     destroy:
       destroyed: Izen yettwakkes
   passwords:
-    lost_password:
+    new:
       title: Awal uffir iṛuḥ
       heading: Tettuḍ awal uffir?
       email address: 'Tansa imayl:'
       new password button: Ales awennez n wawal uffir
-    reset_password:
+    edit:
       title: Ales awennez n wawal uffir
       heading: Ales awennez n wawal uffir i %{user}
       reset: Ales awennez n wawal uffir
-      flash changed: Awal-ik uffir ibeddel.
       flash token bad: Ajiṭun-agi ulac-it, ahat tuccḍa di tansa URL?
+    update:
+      flash changed: Awal-ik uffir ibeddel.
   profiles:
     edit:
       image: 'Tugna:'
@@ -984,7 +986,7 @@ kab:
         facebook:
           title: Qqen s Facebook
           alt: Qqen s umidan Facebook
-        windowslive:
+        microsoft:
           title: Qqen s Windows Live
           alt: Qqen s umiḍan Windows Live
         github:
@@ -1118,7 +1120,8 @@ kab:
     key:
       table:
         entry:
-          forest: Tiẓgi
+          forest:
+          - Tiẓgi
           lake:
           - Amdun
           school:
@@ -1280,7 +1283,6 @@ kab:
       add as friend: Rnu amdakkel
       ct status: 'Tiwtilin n iwiziw:'
       ct declined: Yettwagi
-      latest edit: 'Asnifel aneggaru %{ago} :'
       email address: 'Tansa imayl:'
       created from: 'Yettwarna seg:'
       status: 'Addad:'