Merge branch 'pull/5155'

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

diff --git a/config/locales/sco.yml b/config/locales/sco.yml
index 389717a4e0cf52090eae8b4b6bca1a78e458bd0c..f4133ff3eac7620bd0995bde193bf8ae130ea009 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}
+  changeset_comments:
+    feeds:
+      comment:
+        commented_at_by_html: Updatit %{when} ago bi %{user}
   changesets:
     changeset_paging_nav:
       showing_page: Page %{page}
@@ -180,12 +184,6 @@ sco:
       anonymous: Anonymous
       no_edits: (no eedits)
       view_changeset_details: View chyngeset details
-    changesets:
-      id: ID
-      saved_at: Saved at
-      user: Uiser
-      comment: Comment
-      area: Area
     index:
       title: Chyngesets
       title_user: Chyngesets bi %{user}
@@ -219,9 +217,6 @@ sco:
       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
@@ -237,6 +232,7 @@ sco:
       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
@@ -283,7 +279,8 @@ sco:
       all:
         title: OpenStreetMap diary entries
         description: Recent diary entries frae uisers o OpenStreetMap
-    comments:
+  diary_comments:
+    page:
       post: Post
       when: When
       comment: Comment
@@ -758,7 +755,6 @@ sco:
     gps_traces: GPS Traces
     gps_traces_tooltip: Manage GPS traces
     user_diaries: Uiser Diaries
-    user_diaries_tooltip: View uiser diaries
     edit_with: Eedit wi %{editor}
     tag_line: The Free Wiki Warld Cairt
     intro_header: Walcome tae OpenStreetMap!
@@ -777,9 +773,6 @@ sco:
     community: Commonty
     community_blogs: Commonty Blogs
     community_blogs_title: Blogs frae members o the OpenStreetMap commonty
-    make_a_donation:
-      title: Support OpenStreetMap wi a monetary donation
-      text: Make a Donation
     learn_more: Learn Mair
     more: Mair
   user_mailer:
@@ -799,35 +792,13 @@ sco:
       title: Lost password
       heading: Forgotten Passwird?
   sessions:
-    new:
-      auth_providers:
-        google:
-          title: Login wi Google
-          alt: Login wi a Google OpenID
-        facebook:
-          title: Login wi Facebook
-          alt: Login wi a Facebook Accoont
-        microsoft:
-          title: Login wi Windows Live
-          alt: Login wi a Windows Live Accoont
-        github:
-          title: Login wi GitHub
-          alt: Login wi a GitHub Account
-        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
     destroy:
       title: Logoot
       heading: Logoot frae OpenStreetMap
       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},
@@ -841,7 +812,6 @@ sco:
         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
@@ -922,6 +892,23 @@ sco:
   traces:
     create:
       upload_trace: Uplaid GPS Trace
+  application:
+    auth_providers:
+      google:
+        title: Login wi Google
+        alt: Login wi a Google OpenID
+      facebook:
+        title: Login wi Facebook
+        alt: Login wi a Facebook Accoont
+      microsoft:
+        title: Login wi Windows Live
+        alt: Login wi a Windows Live Accoont
+      github:
+        title: Login wi GitHub
+        alt: Login wi a GitHub Account
+      wikipedia:
+        title: Login wi Wikipedia
+        alt: Login wi a Wikipedia Accoont
   users:
     show:
       edits: Eedits