From 86f3fa2a26f183525a5321fa06a35f12f8da6744 Mon Sep 17 00:00:00 2001
From: asonix <asonix@asonix.dog>
Date: Thu, 21 Jun 2018 19:21:18 -0500
Subject: [PATCH] Update translations

---
 config/locales/dog.yml  | 38 +++++++++++++++++++-------------------
 config/locales/lion.yml | 38 +++++++++++++++++++-------------------
 2 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/config/locales/dog.yml b/config/locales/dog.yml
index 46972188d4..f7b7fa54cd 100644
--- a/config/locales/dog.yml
+++ b/config/locales/dog.yml
@@ -31,7 +31,7 @@ dog:
     source_code: Source code
     status_count_after: toots
     status_count_before: Who authored
-    user_count_after: users
+    user_count_after: dogs
     user_count_before: Home to
     what_is_mastodon: What is Mastodon?
   accounts:
@@ -121,7 +121,7 @@ dog:
       redownload: Refresh avatar
       remove_avatar: Remove avatar
       resend_confirmation:
-        already_confirmed: This user is already confirmed
+        already_confirmed: This dog is already confirmed
         send: Resend confirmation email
         success: Confirmation email successfully sent!
       reset: Reset
@@ -132,7 +132,7 @@ dog:
         admin: Administrator
         moderator: Moderator
         staff: Staff
-        user: User
+        user: Dog
       salmon_url: Salmon URL
       search: Search
       shared_inbox_url: Shared Inbox URL
@@ -153,25 +153,25 @@ dog:
     action_logs:
       actions:
         assigned_to_self_report: "%{name} assigned report %{target} to themselves"
-        change_email_user: "%{name} changed the e-mail address of user %{target}"
-        confirm_user: "%{name} confirmed e-mail address of user %{target}"
+        change_email_user: "%{name} changed the e-mail address of dog %{target}"
+        confirm_user: "%{name} confirmed e-mail address of dog %{target}"
         create_custom_emoji: "%{name} uploaded new emoji %{target}"
         create_domain_block: "%{name} blocked domain %{target}"
         create_email_domain_block: "%{name} blacklisted e-mail domain %{target}"
-        demote_user: "%{name} demoted user %{target}"
+        demote_user: "%{name} demoted dog %{target}"
         destroy_domain_block: "%{name} unblocked domain %{target}"
         destroy_email_domain_block: "%{name} whitelisted e-mail domain %{target}"
         destroy_status: "%{name} removed toot by %{target}"
-        disable_2fa_user: "%{name} disabled two factor requirement for user %{target}"
+        disable_2fa_user: "%{name} disabled two factor requirement for dog %{target}"
         disable_custom_emoji: "%{name} disabled emoji %{target}"
-        disable_user: "%{name} disabled login for user %{target}"
+        disable_user: "%{name} disabled login for dog %{target}"
         enable_custom_emoji: "%{name} enabled emoji %{target}"
-        enable_user: "%{name} enabled login for user %{target}"
+        enable_user: "%{name} enabled login for dog %{target}"
         memorialize_account: "%{name} turned %{target}'s account into a memoriam page"
-        promote_user: "%{name} promoted user %{target}"
+        promote_user: "%{name} promoted dog %{target}"
         remove_avatar_user: "%{name} removed %{target}'s avatar"
         reopen_report: "%{name} reopened report %{target}"
-        reset_password_user: "%{name} reset password of user %{target}"
+        reset_password_user: "%{name} reset password of dog %{target}"
         resolve_report: "%{name} resolved report %{target}"
         silence_account: "%{name} silenced %{target}'s account"
         suspend_account: "%{name} suspended %{target}'s account"
@@ -302,11 +302,11 @@ dog:
       view: View
     settings:
       activity_api_enabled:
-        desc_html: Counts of locally posted toots, active users, and new registrations in weekly buckets
-        title: Publish aggregate statistics about user activity
+        desc_html: Counts of locally posted toots, active dogs, and new registrations in weekly buckets
+        title: Publish aggregate statistics about dog activity
       bootstrap_timeline_accounts:
         desc_html: Separate multiple usernames by comma. Only local and unlocked accounts will work. Default when empty is all local admins.
-        title: Default follows for new users
+        title: Default follows for new dogs
       contact_information:
         email: Business e-mail
         username: Contact username
@@ -333,7 +333,7 @@ dog:
         desc_html: When toggled, it will show toots from all the known fediverse on preview. Otherwise it will only show local toots.
         title: Show known fediverse on timeline preview
       show_staff_badge:
-        desc_html: Show a staff badge on a user page
+        desc_html: Show a staff badge on a dog page
         title: Show staff badge
       site_description:
         desc_html: Introductory paragraph on the frontpage and in meta tags. You can use HTML tags, in particular <code>&lt;a&gt;</code> and <code>&lt;em&gt;</code>.
@@ -424,7 +424,7 @@ dog:
     following: 'Success! You are now following:'
     post_follow:
       close: Or, you can just close this window.
-      return: Return to the user's profile
+      return: Show the dog's profile
       web: Go to web
     title: Follow %{acct}
   datetime:
@@ -524,7 +524,7 @@ dog:
       expires_at: Expires
       uses: Uses
     title: Invite people
-  landing_strip_html: "<strong>%{name}</strong> is a user on %{link_to_root_path}. You can follow them or interact with them if you have an account anywhere in the fediverse."
+  landing_strip_html: "<strong>%{name}</strong> is a dog on %{link_to_root_path}. You can follow them or interact with them if you have an account anywhere in the fediverse."
   landing_strip_signup_html: If you don't, you can <a href="%{sign_up_path}">sign up here</a>.
   lists:
     errors:
@@ -705,7 +705,7 @@ dog:
       <ul>
         <li><em>Basic account information</em>: If you register on this server, you may be asked to enter a username, an e-mail address and a password. You may also enter additional profile information such as a display name and biography, and upload a profile picture and header image. The username, display name, biography, profile picture and header image are always listed publicly.</li>
         <li><em>Posts, following and other public information</em>: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.</li>
-        <li><em>Direct and followers-only posts</em>: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. <em>Please keep in mind that the operators of the server and any receiving server may view such messages</em>, and that recipients may screenshot, copy or otherwise re-share them. <em>Do not share any dangerous information over Mastodon.</em></li>
+        <li><em>Direct and followers-only posts</em>: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and dogs who are mentioned in them, and direct posts are delivered only to dogs mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. <em>Please keep in mind that the operators of the server and any receiving server may view such messages</em>, and that recipients may screenshot, copy or otherwise re-share them. <em>Do not share any dangerous information over Mastodon.</em></li>
         <li><em>IPs and other metadata</em>: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.</li>
       </ul>
 
@@ -735,7 +735,7 @@ dog:
 
       <ul>
         <li>Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.</li>
-        <li>Retain the IP addresses associated with registered users no more than 12 months.</li>
+        <li>Retain the IP addresses associated with registered dogs no more than 12 months.</li>
       </ul>
 
       <p>You can request and download an archive of your content, including your posts, media attachments, profile picture, and header image.</p>
diff --git a/config/locales/lion.yml b/config/locales/lion.yml
index cb1fe23cbd..9719e9e581 100644
--- a/config/locales/lion.yml
+++ b/config/locales/lion.yml
@@ -31,7 +31,7 @@ lion:
     source_code: Source code
     status_count_after: toots
     status_count_before: Who authored
-    user_count_after: users
+    user_count_after: lions
     user_count_before: Home to
     what_is_mastodon: What is Mastodon?
   accounts:
@@ -121,7 +121,7 @@ lion:
       redownload: Refresh avatar
       remove_avatar: Remove avatar
       resend_confirmation:
-        already_confirmed: This user is already confirmed
+        already_confirmed: This lion is already confirmed
         send: Resend confirmation email
         success: Confirmation email successfully sent!
       reset: Reset
@@ -132,7 +132,7 @@ lion:
         admin: Administrator
         moderator: Moderator
         staff: Staff
-        user: User
+        user: Lion
       salmon_url: Salmon URL
       search: Search
       shared_inbox_url: Shared Inbox URL
@@ -153,25 +153,25 @@ lion:
     action_logs:
       actions:
         assigned_to_self_report: "%{name} assigned report %{target} to themselves"
-        change_email_user: "%{name} changed the e-mail address of user %{target}"
-        confirm_user: "%{name} confirmed e-mail address of user %{target}"
+        change_email_user: "%{name} changed the e-mail address of lion %{target}"
+        confirm_user: "%{name} confirmed e-mail address of lion %{target}"
         create_custom_emoji: "%{name} uploaded new emoji %{target}"
         create_domain_block: "%{name} blocked domain %{target}"
         create_email_domain_block: "%{name} blacklisted e-mail domain %{target}"
-        demote_user: "%{name} demoted user %{target}"
+        demote_user: "%{name} demoted lion %{target}"
         destroy_domain_block: "%{name} unblocked domain %{target}"
         destroy_email_domain_block: "%{name} whitelisted e-mail domain %{target}"
         destroy_status: "%{name} removed toot by %{target}"
-        disable_2fa_user: "%{name} disabled two factor requirement for user %{target}"
+        disable_2fa_user: "%{name} disabled two factor requirement for lion %{target}"
         disable_custom_emoji: "%{name} disabled emoji %{target}"
-        disable_user: "%{name} disabled login for user %{target}"
+        disable_user: "%{name} disabled login for lion %{target}"
         enable_custom_emoji: "%{name} enabled emoji %{target}"
-        enable_user: "%{name} enabled login for user %{target}"
+        enable_user: "%{name} enabled login for lion %{target}"
         memorialize_account: "%{name} turned %{target}'s account into a memoriam page"
-        promote_user: "%{name} promoted user %{target}"
+        promote_user: "%{name} promoted lion %{target}"
         remove_avatar_user: "%{name} removed %{target}'s avatar"
         reopen_report: "%{name} reopened report %{target}"
-        reset_password_user: "%{name} reset password of user %{target}"
+        reset_password_user: "%{name} reset password of lion %{target}"
         resolve_report: "%{name} resolved report %{target}"
         silence_account: "%{name} silenced %{target}'s account"
         suspend_account: "%{name} suspended %{target}'s account"
@@ -302,11 +302,11 @@ lion:
       view: View
     settings:
       activity_api_enabled:
-        desc_html: Counts of locally posted toots, active users, and new registrations in weekly buckets
-        title: Publish aggregate statistics about user activity
+        desc_html: Counts of locally posted toots, active lions, and new registrations in weekly buckets
+        title: Publish aggregate statistics about lion activity
       bootstrap_timeline_accounts:
         desc_html: Separate multiple usernames by comma. Only local and unlocked accounts will work. Default when empty is all local admins.
-        title: Default follows for new users
+        title: Default follows for new lions
       contact_information:
         email: Business e-mail
         username: Contact username
@@ -333,7 +333,7 @@ lion:
         desc_html: When toggled, it will show toots from all the known fediverse on preview. Otherwise it will only show local toots.
         title: Show known fediverse on timeline preview
       show_staff_badge:
-        desc_html: Show a staff badge on a user page
+        desc_html: Show a staff badge on a lion page
         title: Show staff badge
       site_description:
         desc_html: Introductory paragraph on the frontpage and in meta tags. You can use HTML tags, in particular <code>&lt;a&gt;</code> and <code>&lt;em&gt;</code>.
@@ -424,7 +424,7 @@ lion:
     following: 'Success! You are now following:'
     post_follow:
       close: Or, you can just close this window.
-      return: Return to the user's profile
+      return: Show the lion's profile
       web: Go to web
     title: Follow %{acct}
   datetime:
@@ -524,7 +524,7 @@ lion:
       expires_at: Expires
       uses: Uses
     title: Invite people
-  landing_strip_html: "<strong>%{name}</strong> is a user on %{link_to_root_path}. You can follow them or interact with them if you have an account anywhere in the fediverse."
+  landing_strip_html: "<strong>%{name}</strong> is a lion on %{link_to_root_path}. You can follow them or interact with them if you have an account anywhere in the fediverse."
   landing_strip_signup_html: If you don't, you can <a href="%{sign_up_path}">sign up here</a>.
   lists:
     errors:
@@ -705,7 +705,7 @@ lion:
       <ul>
         <li><em>Basic account information</em>: If you register on this server, you may be asked to enter a username, an e-mail address and a password. You may also enter additional profile information such as a display name and biography, and upload a profile picture and header image. The username, display name, biography, profile picture and header image are always listed publicly.</li>
         <li><em>Posts, following and other public information</em>: The list of people you follow is listed publicly, the same is true for your followers. When you submit a message, the date and time is stored as well as the application you submitted the message from. Messages may contain media attachments, such as pictures and videos. Public and unlisted posts are available publicly. When you feature a post on your profile, that is also publicly available information. Your posts are delivered to your followers, in some cases it means they are delivered to different servers and copies are stored there. When you delete posts, this is likewise delivered to your followers. The action of reblogging or favouriting another post is always public.</li>
-        <li><em>Direct and followers-only posts</em>: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and users who are mentioned in them, and direct posts are delivered only to users mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. <em>Please keep in mind that the operators of the server and any receiving server may view such messages</em>, and that recipients may screenshot, copy or otherwise re-share them. <em>Do not share any dangerous information over Mastodon.</em></li>
+        <li><em>Direct and followers-only posts</em>: All posts are stored and processed on the server. Followers-only posts are delivered to your followers and lions who are mentioned in them, and direct posts are delivered only to lions mentioned in them. In some cases it means they are delivered to different servers and copies are stored there. We make a good faith effort to limit the access to those posts only to authorized persons, but other servers may fail to do so. Therefore it's important to review servers your followers belong to. You may toggle an option to approve and reject new followers manually in the settings. <em>Please keep in mind that the operators of the server and any receiving server may view such messages</em>, and that recipients may screenshot, copy or otherwise re-share them. <em>Do not share any dangerous information over Mastodon.</em></li>
         <li><em>IPs and other metadata</em>: When you log in, we record the IP address you log in from, as well as the name of your browser application. All the logged in sessions are available for your review and revocation in the settings. The latest IP address used is stored for up to 12 months. We also may retain server logs which include the IP address of every request to our server.</li>
       </ul>
 
@@ -735,7 +735,7 @@ lion:
 
       <ul>
         <li>Retain server logs containing the IP address of all requests to this server, in so far as such logs are kept, no more than 90 days.</li>
-        <li>Retain the IP addresses associated with registered users no more than 12 months.</li>
+        <li>Retain the IP addresses associated with registered lions no more than 12 months.</li>
       </ul>
 
       <p>You can request and download an archive of your content, including your posts, media attachments, profile picture, and header image.</p>