Merge pull request #35 from tomhughes/routing

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

diff --git a/config/locales/br.yml b/config/locales/br.yml
index 9d4e607373ebba0372548606c7659a76094bc2f7..072eee83f9e3be1ac2533d225d121affc92a717f 100644 (file)
--- a/config/locales/br.yml
+++ b/config/locales/br.yml
@@ -547,7 +547,7 @@ br:
           primary_link: Pennhent
           proposed: Hent kinniget
           raceway: Redva
           primary_link: Pennhent
           proposed: Hent kinniget
           raceway: Redva

-          residential: Takad annezet
+          residential: Straed annezet

           rest_area: Leur diskuizh
           road: Hent
           secondary: Hent eil renk
           rest_area: Leur diskuizh
           road: Hent
           secondary: Hent eil renk


@@ -1278,8 +1278,12 @@ br:
     changeset_comment_notification:
       greeting: Demat,
       commented:
     changeset_comment_notification:
       greeting: Demat,
       commented:

+        subject_own: '[OpenStreetMap] %{commenter} en deus addispleget unan eus ho
+          kemmoù'

         subject_other: '[OpenStreetMap] %{commenter} en deus addispleget unan eus
           ho notennoù a sell ouzhoc''h'
         subject_other: '[OpenStreetMap] %{commenter} en deus addispleget unan eus
           ho notennoù a sell ouzhoc''h'

+        your_changeset: '[OpenStreetMap] %{commenter} en deus addispleget unan eus
+          ho holladoù kemmoù krouet d''an %{time}'

         partial_changeset_with_comment: gant an addispleg '%{changeset_comment}'
         partial_changeset_without_comment: Hep evezhiadenn
   message:
         partial_changeset_with_comment: gant an addispleg '%{changeset_comment}'
         partial_changeset_without_comment: Hep evezhiadenn
   message:


@@ -2265,6 +2269,7 @@ br:
       way: Hent
       relation: Darempred
       nothing_found: Arc'hweladur ebet kavet
       way: Hent
       relation: Darempred
       nothing_found: Arc'hweladur ebet kavet

+      error: Fazi o vont e daremmpred gant %{server}:%{error}

   redaction:
     edit:
       description: Deskrivadur
   redaction:
     edit:
       description: Deskrivadur