Merge remote-tracking branch 'upstream/pull/2937' into master

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

diff --git a/config/locales/kab.yml b/config/locales/kab.yml
index 1ef00e768cb31957cca380496c80380442ae67fb..d8281057792e0bc5e7113eaf7ed37ec4fe3365a2 100644 (file)
--- a/config/locales/kab.yml
+++ b/config/locales/kab.yml
@@ -190,9 +190,9 @@ kab:
       relation: Assaɣen (%{count})
       relation_paginated: Assaɣen (%{x}-%{y} si %{count})
       comment: Iwenniten (%{count})
       relation: Assaɣen (%{count})
       relation_paginated: Assaɣen (%{x}-%{y} si %{count})
       comment: Iwenniten (%{count})

-      hidden_commented_by: Awennit yeffren n  %{user} <abbr title='%{exact_time}'>%{when}
+      hidden_commented_by_html: Awennit yeffren n  %{user} <abbr title='%{exact_time}'>%{when}

         aya</abbr>
         aya</abbr>

-      commented_by: Awennit n %{user} <abbr title='%{exact_time}'>%{when} aya</abbr>
+      commented_by_html: Awennit n %{user} <abbr title='%{exact_time}'>%{when} aya</abbr>

       changesetxml: XML n ugraw n ibeddilen
       osmchangexml: XML osmChange
       feed:
       changesetxml: XML n ugraw n ibeddilen
       osmchangexml: XML osmChange
       feed:


@@ -272,19 +272,20 @@ kab:
       open_title: 'Tazmilt ur yefrin ara  #%{note_name}'
       closed_title: 'Tazmilt ur yefrin ara #%{note_name}'
       hidden_title: 'Tazmilt yeffren #%{note_name}'
       open_title: 'Tazmilt ur yefrin ara  #%{note_name}'
       closed_title: 'Tazmilt ur yefrin ara #%{note_name}'
       hidden_title: 'Tazmilt yeffren #%{note_name}'

-      opened_by: Yerna-t %{user} <abbr title='%{exact_time}'>%{when} aya</abbr>
-      opened_by_anonymous: Yernat useqdac udrig <abbr title='%{exact_time}'>%{when}
+      opened_by_html: Yerna-t %{user} <abbr title='%{exact_time}'>%{when} aya</abbr>
+      opened_by_anonymous_html: Yernat useqdac udrig <abbr title='%{exact_time}'>%{when}

         aya</abbr>
         aya</abbr>

-      commented_by: Awennit sɣur %{user} <abbr title='%{exact_time}'>%{when} aya</abbr>
-      commented_by_anonymous: Awennit n useqdac udrig <abbr title='%{exact_time}'>%{when}
+      commented_by_html: Awennit sɣur %{user} <abbr title='%{exact_time}'>%{when}

         aya</abbr>
         aya</abbr>

-      closed_by: Yefra-t %{user} <abbr title='%{exact_time}'>%{when} aya</abbr>
-      closed_by_anonymous: YEfra-t useqdac udrig <abbr title='%{exact_time}'>%{when}
+      commented_by_anonymous_html: Awennit n useqdac udrig <abbr title='%{exact_time}'>%{when}

         aya</abbr>
         aya</abbr>

-      reopened_by: Irmed-it %{user} <abbr title='%{exact_time}'>%{when} aya</abbr>
-      reopened_by_anonymous: Irmed-it useqdac udrig <abbr title='%{exact_time}'>%{when}
+      closed_by_html: Yefra-t %{user} <abbr title='%{exact_time}'>%{when} aya</abbr>
+      closed_by_anonymous_html: YEfra-t useqdac udrig <abbr title='%{exact_time}'>%{when}

         aya</abbr>
         aya</abbr>

-      hidden_by: Yeffer-it %{user} <abbr title='%{exact_time}'>%{when} aya</abbr>
+      reopened_by_html: Irmed-it %{user} <abbr title='%{exact_time}'>%{when} aya</abbr>
+      reopened_by_anonymous_html: Irmed-it useqdac udrig <abbr title='%{exact_time}'>%{when}
+        aya</abbr>
+      hidden_by_html: Yeffer-it %{user} <abbr title='%{exact_time}'>%{when} aya</abbr>

       report: Sillef tazmilt agi
     query:
       title: Tuttriwin ɣef tɣawsiwin
       report: Sillef tazmilt agi
     query:
       title: Tuttriwin ɣef tɣawsiwin


@@ -728,11 +729,6 @@ kab:
         level8: Talast n temdint
         level9: Talast n taddart
         level10: Talast n ugmama
         level8: Talast n temdint
         level9: Talast n taddart
         level10: Talast n ugmama

-    description:
-      title:
-        osm_nominatim: Asideg si <a href="https://nominatim.openstreetmap.org/">OpenStreetMap
-          Nominatim</a>
-        geonames: Adig si <a href="http://www.geonames.org/">GeoNames</a>

       types:
         cities: Timdinin
         towns: Tuddar
       types:
         cities: Timdinin
         towns: Tuddar


@@ -1426,9 +1422,9 @@ kab:
       confirm: Sentem
   user_blocks:
     helper:
       confirm: Sentem
   user_blocks:
     helper:

-      time_future: Ad ifak di %{time}.
+      time_future_html: Ad ifak di %{time}.

       until_login: D urmid arama yeqqen useqdac
       until_login: D urmid arama yeqqen useqdac

-      time_past: Ifuk %{time} aya.
+      time_past_html: Ifuk %{time} aya.

     blocks_on:
       title: Asewḥel n %{name}
       empty: '%{name} ur yewḥil ara yakan.'
     blocks_on:
       title: Asewḥel n %{name}
       empty: '%{name} ur yewḥil ara yakan.'