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

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

diff --git a/config/locales/en.yml b/config/locales/en.yml
index d24987aefb28deb07769794c1e8d3a4903716def..417267808be8d922cb92cb71bf2d70e55ba1db1d 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1726,8 +1726,8 @@ en:
       success: "Confirmed your account, thanks for signing up!"
       already active: "This account has already been confirmed."
       unknown token: "That confirmation code has expired or does not exist."
       success: "Confirmed your account, thanks for signing up!"
       already active: "This account has already been confirmed."
       unknown token: "That confirmation code has expired or does not exist."

-      resend_html: "If you need us to resend the confirmation email, %{reconfirm_link}."
-      click_here: click here
+      if_need_resend: "If you need us to resend the confirmation email, click the button below."
+      resend_button: Resend the confirmation email

     confirm_resend:
       failure: "User %{name} not found."
     confirm_email:
     confirm_resend:
       failure: "User %{name} not found."
     confirm_email:


@@ -2632,6 +2632,9 @@ en:
       email:
         title: Share via Email
         alt: Email icon
       email:
         title: Share via Email
         alt: Email icon

+      bluesky:
+        title: Share via Bluesky
+        alt: Bluesky Icon

       facebook:
         title: Share via Facebook
         alt: Facebook Icon
       facebook:
         title: Share via Facebook
         alt: Facebook Icon


@@ -2843,18 +2846,20 @@ en:
       report: Report this User
     go_public:
       flash success: "All your edits are now public, and you are now allowed to edit."
       report: Report this User
     go_public:
       flash success: "All your edits are now public, and you are now allowed to edit."

-    index:
-      title: Users
-      heading: Users
-      summary_html: "%{name} created from %{ip_address} on %{date}"
-      summary_no_ip_html: "%{name} created on %{date}"
-      empty: No matching users found
-    page:
-      found_users:
-        one: "%{count} user found"
-        other: "%{count} users found"
-      confirm: Confirm Selected Users
-      hide: Hide Selected Users
+    lists:
+      show:
+        title: Users
+        heading: Users
+        empty: No matching users found
+      page:
+        found_users:
+          one: "%{count} user found"
+          other: "%{count} users found"
+        confirm: Confirm Selected Users
+        hide: Hide Selected Users
+      user:
+        summary_html: "%{name} created from %{ip_address} on %{date}"
+        summary_no_ip_html: "%{name} created on %{date}"

     suspended:
       title: Account Suspended
       heading: Account Suspended
     suspended:
       title: Account Suspended
       heading: Account Suspended


@@ -3100,7 +3105,7 @@ en:
       center_marker: "Center map on marker"
       paste_html: "Paste HTML to embed in website"
       view_larger_map: "View Larger Map"
       center_marker: "Center map on marker"
       paste_html: "Paste HTML to embed in website"
       view_larger_map: "View Larger Map"

-      only_standard_layer: "Only the Standard, Cycle Map and Transport layers can be exported as an image"
+      only_layers_exported_as_image: "Only the following layers can be exported as an image:"

     embed:
       report_problem: "Report a problem"
     key:
     embed:
       report_problem: "Report a problem"
     key: