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

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index ac968b36b5c00f2096f30e4a0c5e8f714a91492e..61508e339d61394e8a68fb12bd116a7d526a7464 100644 (file)
--- a/config/locales/sco.yml
+++ b/config/locales/sco.yml
@@ -171,6 +171,10 @@ sco:
       wikidata_link: The %{page} item on Wikidata
       wikipedia_link: The %{page} airticle on Wikipaedia
       telephone_link: Caw %{phone_number}
       wikidata_link: The %{page} item on Wikidata
       wikipedia_link: The %{page} airticle on Wikipaedia
       telephone_link: Caw %{phone_number}

+  changeset_comments:
+    feeds:
+      comment:
+        commented_at_by_html: Updatit %{when} ago bi %{user}

   changesets:
     changeset_paging_nav:
       showing_page: Page %{page}
   changesets:
     changeset_paging_nav:
       showing_page: Page %{page}


@@ -219,9 +223,6 @@ sco:
       relations_paginated: Relations (%{x}-%{y} of %{count})
     timeout:
       sorry: Sorry, the leet o chyngesets ye requestit teuk too lang tae retrieve.
       relations_paginated: Relations (%{x}-%{y} of %{count})
     timeout:
       sorry: Sorry, the leet o chyngesets ye requestit teuk too lang tae retrieve.

-  changeset_comments:
-    comment:
-      commented_at_by_html: Updatit %{when} ago bi %{user}

   diary_entries:
     new:
       title: New Diary Entry
   diary_entries:
     new:
       title: New Diary Entry


@@ -237,6 +238,7 @@ sco:
       new: New Diary Entry
       new_title: Compone a new entry in yer uiser diary
       no_entries: No diary entries
       new: New Diary Entry
       new_title: Compone a new entry in yer uiser diary
       no_entries: No diary entries

+    page:

       recent_entries: Recent diary entries
       older_entries: Aulder Entries
       newer_entries: Newer Entries
       recent_entries: Recent diary entries
       older_entries: Aulder Entries
       newer_entries: Newer Entries


@@ -283,7 +285,8 @@ sco:
       all:
         title: OpenStreetMap diary entries
         description: Recent diary entries frae uisers o OpenStreetMap
       all:
         title: OpenStreetMap diary entries
         description: Recent diary entries frae uisers o OpenStreetMap

-    comments:
+  diary_comments:
+    page:

       post: Post
       when: When
       comment: Comment
       post: Post
       when: When
       comment: Comment


@@ -805,6 +808,7 @@ sco:
       logout_button: Logoot
   site:
     copyright:
       logout_button: Logoot
   site:
     copyright:

+      title: Copyricht an License

       foreign:
         title: Aboot this translation
         html: In the event of a conflict atween this translatit page an %{english_original_link},
       foreign:
         title: Aboot this translation
         html: In the event of a conflict atween this translatit page an %{english_original_link},


@@ -818,7 +822,6 @@ sco:
         native_link: Scots version
         mapping_link: stairt cairttin
       legal_babble:
         native_link: Scots version
         mapping_link: stairt cairttin
       legal_babble:

-        title_html: Copyricht an License

         credit_title_html: Hou tae credit OpenStreetMap
         credit_1_html: |-
           We require that ye uise the credit “© OpenStreetMap
         credit_title_html: Hou tae credit OpenStreetMap
         credit_1_html: |-
           We require that ye uise the credit “© OpenStreetMap


@@ -916,12 +919,6 @@ sco:
       wikipedia:
         title: Login wi Wikipedia
         alt: Login wi a Wikipedia Accoont
       wikipedia:
         title: Login wi Wikipedia
         alt: Login wi a Wikipedia Accoont

-      wordpress:
-        title: Login wi Wordpress
-        alt: Login wi a Wordpress OpenID
-      aol:
-        title: Login wi AOL
-        alt: Login wi an AOL OpenID

   users:
     show:
       edits: Eedits
   users:
     show:
       edits: Eedits