X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/8abe9e2d10a4cef92418f7cebf1483827b58ab0b..e2cb2327f9e5a3a107dbe249e4fe503cbde45d24:/config/locales/en.yml

diff --git a/config/locales/en.yml b/config/locales/en.yml
index e8fa8ddee..e14c5806c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -212,7 +212,7 @@ en:
       openid: OpenID
       google: Google
       facebook: Facebook
-      windowslive: Windows Live
+      windowslive: Microsoft
       github: GitHub
       wikipedia: Wikipedia
   api:
@@ -350,6 +350,7 @@ en:
       history_title_html: "Way History: %{name}"
       nodes: "Nodes"
       nodes_count:
+        one: "%{count} node"
         other: "%{count} nodes"
       also_part_of_html:
         one: "part of way %{related_ways}"
@@ -515,9 +516,9 @@ en:
       comment_link: Comment on this entry
       reply_link: Send a message to the author
       comment_count:
-        zero: No comments
         one: "%{count} comment"
         other: "%{count} comments"
+      no_comments: No comments
       edit_link: Edit this entry
       hide_link: Hide this entry
       unhide_link: Unhide this entry
@@ -1403,9 +1404,9 @@ en:
     show:
       title: "%{status} Issue #%{issue_id}"
       reports:
-        zero: No reports
         one: "%{count} report"
         other: "%{count} reports"
+      no_reports: No reports
       report_created_at: "First reported at %{datetime}"
       last_resolved_at: "Last resolved at %{datetime}"
       last_updated_at: "Last updated at %{datetime} by %{displayname}"
@@ -1753,6 +1754,9 @@ en:
       home location: "Home Location"
       no home location: "You have not entered your home location."
       update home location on click: "Update home location when I click on the map?"
+      show: "Show"
+      delete: "Delete"
+      undelete: "Undo delete"
     update:
       success: Profile updated.
       failure: Couldn't update profile.
@@ -1782,8 +1786,8 @@ en:
           title: Login with Facebook
           alt: Login with a Facebook Account
         windowslive:
-          title: Login with Windows Live
-          alt: Login with a Windows Live Account
+          title: Login with Microsoft
+          alt: Login with a Microsoft Account
         github:
           title: Login with GitHub
           alt: Login with a GitHub Account
@@ -2015,6 +2019,14 @@ en:
         contributors_nz_linz_data_service_url: https://data.linz.govt.nz/
         contributors_nz_cc_by: CC BY 4.0
         contributors_nz_cc_by_url: https://creativecommons.org/licenses/by/4.0/
+        contributors_rs_credit_html: |
+          %{serbia}: Contains data from the %{rgz_link} and %{open_data_portal}
+          (public information of Serbia), 2018.
+        contributors_rs_serbia: Serbia
+        contributors_rs_rgz: Serbian Geodetic Authority
+        contributors_rs_rgz_url: https://geosrbija.rs/
+        contributors_rs_open_data_portal: National Open Data Portal
+        contributors_rs_open_data_portal_url: https://data.gov.rs/sr/
         contributors_si_credit_html: |
           %{slovenia}: Contains data from the %{gu_link} and %{mkgp_link}
           (public information of Slovenia).
@@ -2425,7 +2437,6 @@ en:
       visibility: "Visibility:"
       confirm_delete: "Delete this trace?"
     trace_paging_nav:
-      showing_page: "Page %{page}"
       older: "Older Traces"
       newer: "Newer Traces"
     trace: