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

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

diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index a5abc42d71a5ac365c218fdddb45eac3c025508f..bde2c84e104e7d92eadc2f85838e9e6469e3223b 100644 (file)
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -252,12 +252,8 @@ kab:
       way_paginated: Iberdan (%{x}-%{y} si %{count})
       relation: Assaɣen (%{count})
       relation_paginated: Assaɣen (%{x}-%{y} si %{count})
-      comment: Iwenniten (%{count})
       changesetxml: XML n ugraw n ibeddilen
       osmchangexml: XML osmChange
-      feed:
-        title: Agraw n usnifel %{id}
-        title_comment: Agraw n ubeddel %{id} - %{comment}
       join_discussion: Qqen akken ad tedduḍ ar usqerdec
       discussion: Asqerdec
       still_open: Tagrumma isenfilen zgan ldin - asqerdec ad yili mara isenfilen meṛṛa
@@ -357,6 +353,9 @@ kab:
       no_more_area: Ulac agraw-nniḍen n usnifel yettwafen di temnaḍt-agi.
       no_more_user: Ulac agraw-nniḍen n usnifel n useqdac-agi.
       load_more: Sali ugar
+      feed:
+        title: Agraw n usnifel %{id}
+        title_comment: Agraw n ubeddel %{id} - %{comment}
     timeout:
       sorry: Suref-aɣ, tabdart n igrawen n usnifel i d-sutreḍ tettwai ddeqs n wakud
         akkena d d-ali.
@@ -376,6 +375,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
@@ -902,9 +902,10 @@ kab:
   messages:
     inbox:
       title: Tanaka n urmas
-      my_inbox: Tanaka-iw n urmas
       messages: Ɣur-k %{new_messages} akked %{old_messages}
+    messages_table:
       from: Seg
+      to: I
       subject: Asentel
       date: Azemz
     message_summary:
@@ -922,9 +923,6 @@ kab:
       body: Suref-aɣ, ulac izen s usulay-agi.
     outbox:
       title: Tanaka n tuzna
-      to: I
-      subject: Asentel
-      date: Azemz
     show:
       title: Ɣeṛ izen
       reply_button: Err
@@ -933,23 +931,26 @@ kab:
       back: Uɣal
     sent_message_summary:
       destroy_button: Kkes
+    heading:
+      my_inbox: Tanaka-iw n urmas
     mark:
       as_read: Izen yettwacred yettwaɣra
       as_unread: Izen yettwacred ur yettwaɣra ara
     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:'
@@ -967,7 +968,6 @@ kab:
       heading: Qqen
       email or username: 'Tansa imayl neɣ isem n useqdac:'
       password: 'Awal uffir:'
-      openid_html: '%{logo} OpenID:'
       remember: Cfu fell-i
       lost password link: Tweddreḍ awal-ik uffir?
       login_button: Qqen
@@ -1035,12 +1035,7 @@ kab:
       user_page_link: asebter n useqdac
     export:
       title: Sifeḍ
-      area_to_export: Tamnaḍt n usifeḍ
       manually_select: Fren s ufus tamnadt-nniḍen
-      format_to_export: Amasal n usifeḍ
-      osm_xml_data: Isefka XML OpenStreetMap
-      map_image: Tugna n tkarḍa (ad tesken akalku n tegnut)
-      embeddable_html: HTML yettwaslaɣen
       licence: Turagt
       too_large:
         advice: 'Ma yella asifed ddaw-a yeɣli, seqdec ma ulac aɣilif tiɣbula yettwabedren
@@ -1061,17 +1056,6 @@ kab:
         other:
           title: Iɣbula-nniḍen
           description: Ibula-nniḍen yettwabedren deug uwiki OpenStreetMap
-      options: Iɣewwaṛen
-      format: Amasal
-      scale: Sellum
-      max: afellay
-      image_size: Teɣzi n tugna
-      zoom: Semɣeṛ
-      add_marker: Rnu taṛekkizt ɣef tkarḍa
-      latitude: 'Tarrut:'
-      longitude: 'Tazegrart:'
-      output: Tuffɣa
-      paste_html: Senteḍ tangalt HTML deg usmel Web
       export_button: Sifeḍ
     fixthemap:
       how_to_help:
@@ -1092,9 +1076,6 @@ kab:
       beginners_guide:
         title: Amnir n ulemad
         description: Aminir i yinelmaden imaynuten i t-xeddem tmezdagnut.
-      help:
-        title: help.openstreetmap.org
-        description: Steqsi neɣ nadi tiririyin deg usmel akked isteqsiyen n OSM.
       mailing_lists:
         title: Tabraṭṭ n tnezwit
       irc:
@@ -1119,11 +1100,9 @@ kab:
       table:
         entry:
           forest: Tiẓgi
-          lake:
-          - Amdun
-          school:
-          - Aɣerbaz
-          - Tasdawit
+          lake: Amdun
+          school: Aɣerbaz
+          university: Tasdawit
     welcome:
       title: Anṣuf!
       whats_on_the_map:
@@ -1280,7 +1259,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:'