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

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

diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 4ab75d23c7feeef720fab5fb13a84636c66af5d4..96b40a219aff25b19689c3c75a55fa7111117f3b 100644 (file)
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -223,8 +223,8 @@ ga:
       open_title: 'Nóta neamhréitithe #%{note_name}'
       closed_title: 'Nóta réitithe #%{note_name}'
       hidden_title: 'Nóta folaithe #%{note_name}'
       open_title: 'Nóta neamhréitithe #%{note_name}'
       closed_title: 'Nóta réitithe #%{note_name}'
       hidden_title: 'Nóta folaithe #%{note_name}'

-      open_by: Cruthaithe ag %{user} <abbr title='%{exact_time}'>%{when} ó shin</abbr>
-      open_by_anonymous: Cruthaithe ag duine gan ainm <abbr title='%{exact_time}'>%{when}
+      opened_by: Cruthaithe ag %{user} <abbr title='%{exact_time}'>%{when} ó shin</abbr>
+      opened_by_anonymous: Cruthaithe ag duine gan ainm <abbr title='%{exact_time}'>%{when}

         ó shin</abbr>
       commented_by: Nóta tráchta ó %{user} <abbr title='%{exact_time}'>%{when} ó shin</abbr>
       commented_by_anonymous: Nóta tráchta ó dhuine gan ainm <abbr title='%{exact_time}'>%{when}
         ó shin</abbr>
       commented_by: Nóta tráchta ó %{user} <abbr title='%{exact_time}'>%{when} ó shin</abbr>
       commented_by_anonymous: Nóta tráchta ó dhuine gan ainm <abbr title='%{exact_time}'>%{when}


@@ -353,7 +353,6 @@ ga:
       post: Postáil
       when: Cá huair
       comment: Nóta tráchta
       post: Postáil
       when: Cá huair
       comment: Nóta tráchta

-      ago: '%{ago} ó shin'

       newer_comments: Nótaí Tráchta Níos Úire
       older_comments: Nótaí Tráchta Níos Sine
   geocoder:
       newer_comments: Nótaí Tráchta Níos Úire
       older_comments: Nótaí Tráchta Níos Sine
   geocoder:


@@ -1697,7 +1696,6 @@ ga:
     trace:
       pending: AR FEITHEAMH
       count_points: '%{count} pointe'
     trace:
       pending: AR FEITHEAMH
       count_points: '%{count} pointe'

-      ago: '%{time_in_words_ago} ó shin'

       more: tuilleadh
       trace_details: Amharc ar Shonraí an Loirg
       view_map: Amharc ar an Léarscáil
       more: tuilleadh
       trace_details: Amharc ar Shonraí an Loirg
       view_map: Amharc ar an Léarscáil


@@ -1721,7 +1719,7 @@ ga:
         vicí</a>.
       upload_trace: Lorg a uaslódáil
       see_all_traces: Féach gach lorg
         vicí</a>.
       upload_trace: Lorg a uaslódáil
       see_all_traces: Féach gach lorg

-    delete:
+    destroy:

       scheduled_for_deletion: Lorg sceidealta le scriosadh
     make_public:
       made_public: Lorg curtha ar fáil go poiblí
       scheduled_for_deletion: Lorg sceidealta le scriosadh
     make_public:
       made_public: Lorg curtha ar fáil go poiblí


@@ -1976,10 +1974,8 @@ ga:
       remove as friend: Bris cairdeas
       add as friend: Cuir Cara Leis
       mapper since: 'Ag léarscáiliú ó:'
       remove as friend: Bris cairdeas
       add as friend: Cuir Cara Leis
       mapper since: 'Ag léarscáiliú ó:'

-      ago: (%{time_in_words_ago} ó shin)

       ct status: 'Téarmaí do rannchuiditheoirí:'
       ct declined: Diúltaithe
       ct status: 'Téarmaí do rannchuiditheoirí:'
       ct declined: Diúltaithe

-      ct accepted: Glactha leis %{ago} ó shin

       latest edit: 'Athrú is déanaí %{ago}:'
       email address: 'Seoladh ríomhphoist:'
       created from: 'Cruthaithe ó:'
       latest edit: 'Athrú is déanaí %{ago}:'
       email address: 'Seoladh ríomhphoist:'
       created from: 'Cruthaithe ó:'


@@ -2104,7 +2100,6 @@ ga:
     mine:
       id: ID
       last_changed: Athrú deireanach
     mine:
       id: ID
       last_changed: Athrú deireanach

-      ago_html: '%{when} ó shin'

   javascripts:
     close: Dún
     share:
   javascripts:
     close: Dún
     share: