Improve display of user block timestamps

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index d426faabe537d84026492c2f6519ff76085d42c6..0a6f108e7ee4def2d88f75f84a68418304bb976c 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -953,6 +953,10 @@ en:
       text: Make a Donation
     learn_more: "Learn More"
     more: More
+    donate_header: Support OpenStreetMap
+    donate_line_1: Bigger Servers for a
+    donate_line_2: Growing OpenStreetMap
+    donate_line_3: Hardware Funding Drive 2015
   license_page:
     foreign:
       title: About this translation
@@ -1110,6 +1114,14 @@ en:
       tag_html: |
         A <strong>tag</strong> is a bit of data about a node or way, like a
         restaurant's name or a road's speed limit.
+    rules:
+      title: Rules!
+      paragraph_1_html: |
+        OpenStreetMap has few formal rules but we expect all participants to collaborate
+        with, and communicate with, the community. If you are considering
+        any activities other than editing by hand, please read and follow the guidelines on 
+        <a href='http://wiki.openstreetmap.org/wiki/Import/Guidelines'>Imports</a> and 
+        <a href='http://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct'>Automated Edits</a>.
     questions:
       title: Any questions?
       paragraph_1_html: |
@@ -1720,6 +1732,12 @@ en:
         google:
           title: Login with Google
           alt: Login with a Google OpenID
+        facebook:
+          title: Login with Facebook
+          alt: Login with a Facebook Account
+        windowslive:
+          title: Login with Windows Live
+          alt: Login with a Windows Live Account
         yahoo:
           title: Login with Yahoo
           alt: Login with a Yahoo OpenID
@@ -1991,6 +2009,9 @@ en:
     auth_failure:
       connection_failed: Connection to authentication provider failed
       invalid_credentials: Invalid authentication credentials
+      no_authorization_code: No authorization code
+      unknown_signature_algorithm: Unknown signature algorithm
+      invalid_scope: Invalid scope
   user_role:
     filter:
       not_an_administrator: "Only administrators can perform user role management, and you are not an administrator."
@@ -2091,6 +2112,8 @@ en:
       heading: "%{block_on} blocked by %{block_by}"
       time_future: "Ends in %{time}"
       time_past: "Ended %{time} ago"
+      created: "Created"
+      ago: "%{time} ago"
       status: "Status"
       show: "Show"
       edit: "Edit"