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

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

diff --git a/config/locales/sc.yml b/config/locales/sc.yml
index 92d9043aab0513925c5a7fb3bc7cf5fed2b0f6de..4efe44d8a16f02ad0b7abee25e3c85ed45072c73 100644 (file)
--- a/config/locales/sc.yml
+++ b/config/locales/sc.yml
@@ -221,6 +221,7 @@ sc:
       openid: OpenID
       google: Google
       facebook: Facebook
       openid: OpenID
       google: Google
       facebook: Facebook

+      microsoft: Microsoft

       github: GitHub
       wikipedia: Wikipedia
   api:
       github: GitHub
       wikipedia: Wikipedia
   api:


@@ -236,6 +237,7 @@ sc:
         reopened_at_by_html: Torrada a ativare %{when} dae %{user}
       rss:
         title: Notas de OpenStreetMap
         reopened_at_by_html: Torrada a ativare %{when} dae %{user}
       rss:
         title: Notas de OpenStreetMap

+        description_all: Una lista de notas sinnaladas, cummentadas o tancadas

         description_area: Una lista de notas, cummentadas o tancadas in s'àrea tua
           [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
         description_item: Unu flussu de informatziones rss pro sa nota %{id}
         description_area: Una lista de notas, cummentadas o tancadas in s'àrea tua
           [(%{min_lat}|%{min_lon}) -- (%{max_lat}|%{max_lon})]
         description_item: Unu flussu de informatziones rss pro sa nota %{id}


@@ -2999,7 +3001,9 @@ sc:
     index:
       title: Notas insertadas o cummentadas dae %{user}
       heading: Notas de %{user}
     index:
       title: Notas insertadas o cummentadas dae %{user}
       heading: Notas de %{user}

-      subheading_html: Notas imbiadas o cummentadas dae %{user}
+      subheading_html: Notas %{submitted} o %{commented} dae %{user}
+      subheading_submitted: imbiadas
+      subheading_commented: cummentadas

       no_notes: Peruna nota
       id: Id
       creator: Creadore
       no_notes: Peruna nota
       id: Id
       creator: Creadore