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

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

diff --git a/config/locales/gd.yml b/config/locales/gd.yml
index cc09459225c14b77b2055d886a56323a8259b60c..656dc98255294a970ea516e9f6455f222bcaf93e 100644 (file)
--- a/config/locales/gd.yml
+++ b/config/locales/gd.yml
@@ -320,7 +320,6 @@ gd:
         way: Slighe
         relation: Dàimh
     containing_relation:
         way: Slighe
         relation: Dàimh
     containing_relation:

-      entry_html: Dàimh %{relation_name}

       entry_role_html: Dàimh %{relation_name} ('na %{relation_role})
     not_found:
       sorry: Duilich ach cha deach %{type} àireamh %{id} a lorg.
       entry_role_html: Dàimh %{relation_name} ('na %{relation_role})
     not_found:
       sorry: Duilich ach cha deach %{type} àireamh %{id} a lorg.


@@ -1828,7 +1827,6 @@ gd:
       reason: 'Adhbhar a'' bhacaidh:'
       revoker: 'Cùl-ghairm le:'
     block:
       reason: 'Adhbhar a'' bhacaidh:'
       revoker: 'Cùl-ghairm le:'
     block:

-      not_revoked: (cha deach a chùl-ghairm)

       show: Seall
       edit: Deasaich
     page:
       show: Seall
       edit: Deasaich
     page:


@@ -1836,7 +1834,6 @@ gd:
       creator_name: Cruthadair
       reason: Adhbhar a' bhacaidh
       status: Staid
       creator_name: Cruthadair
       reason: Adhbhar a' bhacaidh
       status: Staid

-      revoker_name: Air a chùl-ghairm le

   notes:
     index:
       title: Nòtaichean a chuir %{user} a-null no a thug %{user} beachd dhaibh
   notes:
     index:
       title: Nòtaichean a chuir %{user} a-null no a thug %{user} beachd dhaibh