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

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

diff --git a/config/locales/ga.yml b/config/locales/ga.yml
index 318df903a3775c923d41a5604d693c7a1e1e2fc0..3d201bd362611ef2a9baea6a8f4e290688ae9f31 100644 (file)
--- a/config/locales/ga.yml
+++ b/config/locales/ga.yml
@@ -708,7 +708,6 @@ ga:
           commercial: Limistéar Tráchtála
           conservation: Caomhnú
           construction: Tógáil
           commercial: Limistéar Tráchtála
           conservation: Caomhnú
           construction: Tógáil

-          farm: Feirm

           farmland: Talamh Feirme
           farmyard: Clós Feirme
           forest: Foraois
           farmland: Talamh Feirme
           farmyard: Clós Feirme
           forest: Foraois


@@ -1841,7 +1840,6 @@ ga:
       in: in
     index:
       public_traces: Loirg GPS phoiblí
       in: in
     index:
       public_traces: Loirg GPS phoiblí

-      my_traces: Mo loirg GPS

       public_traces_from: Loirg GPS phoiblí ó %{user}
       description: Brabhsáil rianta GPS a uaslódáladh le déanaí
       tagged_with: a bhfuil na clibeanna %{tags} acu
       public_traces_from: Loirg GPS phoiblí ó %{user}
       description: Brabhsáil rianta GPS a uaslódáladh le déanaí
       tagged_with: a bhfuil na clibeanna %{tags} acu


@@ -1849,6 +1847,7 @@ ga:
         nó is féidir tuilleadh a fhoghlaim faoi rianú GPS ar an <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>leathanach
         vicí</a>.
       upload_trace: Lorg a uaslódáil
         nó is féidir tuilleadh a fhoghlaim faoi rianú GPS ar an <a href='https://wiki.openstreetmap.org/wiki/Beginners_Guide_1.2'>leathanach
         vicí</a>.
       upload_trace: Lorg a uaslódáil

+      my_traces: Mo loirg GPS

     destroy:
       scheduled_for_deletion: Lorg sceidealta le scriosadh
     make_public:
     destroy:
       scheduled_for_deletion: Lorg sceidealta le scriosadh
     make_public: