Clean up locale files

- Adjusts namespacing in support of flarum/core#648.
- Corrects key alphabetization in a few locale files.

extensions/lang-english/locale/core.yml

@@ -338,14 +338,15 @@ core:
     badge:
       hidden_tooltip: Hidden
 
-    # This translation is displayed in place of the username of a deleted user account.
+    # These translations are used to modify usernames.
-    deleted_user_text: "[deleted]"
+    username:
+      deleted_text: "[deleted]"
 
     # These translations are displayed as error messages.
     error:
       generic_message: "Oops! Something went wrong. Please reload the page and try again."
-      permission_denied_message: You do not have permission to do that.
       not_found_message: The requested resource was not found.
+      permission_denied_message: You do not have permission to do that.
       rate_limit_exceeded_message: You're going a little too quickly. Please try again in a few seconds.
 
     # These translations are used as suffixes when abbreviating numbers.
@@ -356,14 +357,14 @@ core:
     # These translations are used to punctuate a series of items.
     series:
       glue_text: ", "
-      two_text: "{first} and {second}"
       three_text: "{first}, {second}, and {third}"
+      two_text: "{first} and {second}"
 
   # Translations in this namespace are used in basic HTML interface.
   basic:
-    loading_text: Loading...
-    load_error_message: Something went wrong while trying to load the full version of this site.
     javascript_disabled_message: This site is best viewed in a modern browser with JavaScript enabled.
+    load_error_message: Something went wrong while trying to load the full version of this site.
+    loading_text: Loading...
     next_page_button: Next Page
     previous_page_button: Previous Page
 
@@ -372,7 +373,6 @@ core:
 
     # These translations are used in emails sent when users register new accounts.
     activate_account:
-      subject: Activate Your New Account
       body: |
         Hey {username}!
 
@@ -382,10 +382,10 @@ core:
         {url}
 
         If you did not sign up, please ignore this email.
+      subject: Activate Your New Account
 
     # These translations are used in emails sent when users change their email address.
     confirm_email:
-      subject: Confirm Your New Email Address
       body: |
         Hey {username}!
 
@@ -395,10 +395,10 @@ core:
         {url}
 
         If this was not you, please ignore this email.
+      subject: Confirm Your New Email Address
 
     # These translations are used in emails sent when users ask to reset their passwords.
     reset_password:
-      subject: Reset Your Password
       body: |
         Hey {username}!
 
@@ -408,6 +408,7 @@ core:
         {url}
 
         If you do not wish to change your password, just ignore this email and nothing will happen.
+      subject: Reset Your Password
 
   ##
   # REUSED TRANSLATIONS - These keys should not be used directly in code!

extensions/lang-english/locale/flarum-likes.yml

@@ -16,14 +16,14 @@ flarum-likes:
 
     # These translations are used by the Notifications dropdown, a.k.a. "the bell".
     notifications:
-      post_liked_text: "{username} liked your post"  # Can be pluralized to agree with the number of users!
       others_text: => core.ref.some_others
+      post_liked_text: "{username} liked your post"  # Can be pluralized to agree with the number of users!
 
     # These translations are displayed beneath individual posts.
     post:
       like_link: Like
-      liked_by_text: "{users} likes this.|{users} like this."
       liked_by_self_text: "{users} like this."  # Can be pluralized to agree with the number of users!
+      liked_by_text: "{users} likes this.|{users} like this."
       others_link: => core.ref.some_others
       unlike_link: Unlike
       you_text: => core.ref.you

extensions/lang-english/locale/flarum-mentions.yml

@@ -13,14 +13,14 @@ flarum-mentions:
 
     # These translations are used by the Notifications dropdown, a.k.a. "the bell".
     notifications:
-      post_mentioned_text: "{username} replied to your post"  # Can be pluralized to agree with the number of users!
       others_text: => core.ref.some_others
+      post_mentioned_text: "{username} replied to your post"  # Can be pluralized to agree with the number of users!
       user_mentioned_text: "{username} mentioned you"
 
     # These translations are displayed beneath individual posts.
     post:
-      mentioned_by_text: "{users} replied to this."       # Can be pluralized to agree with the number of users!
       mentioned_by_self_text: "{users} replied to this."  # Can be pluralized to agree with the number of users!
+      mentioned_by_text: "{users} replied to this."       # Can be pluralized to agree with the number of users!
       others_text: => core.ref.some_others
       reply_link: => core.ref.reply
       you_text: => core.ref.you

extensions/lang-english/locale/flarum-suspend.yml

@@ -16,12 +16,12 @@ flarum-suspend:
 
     # These translations are used in the Suspend User modal dialog (admin function).
     suspend_user:
-      submit_button: => core.ref.save_changes
       indefinitely_label: Suspended indefinitely
       limited_time_label: Suspended for a limited time...
       limited_time_days_text: " days"
       not_suspended_label: Not suspended
       status_heading: Suspension Status
+      submit_button: => core.ref.save_changes
       title: "Suspend {user}"
 
     # These translations are displayed as tooltips for user badges.

extensions/lang-english/locale/flarum-tags.yml

@@ -14,9 +14,9 @@ flarum-tags:
     # These translations are used in the Edit Tag modal dialog.
     edit_tag:
       color_label: Color
-      description_label: Description
       delete_tag_button: Delete Tag
       delete_tag_confirmation: "Are you sure you want to delete this tag? The tag's discussions will NOT be deleted."
+      description_label: Description
       hide_label: Hide from All Discussions
       name_label: => flarum-tags.ref.name
       name_placeholder: => flarum-tags.ref.name
@@ -31,9 +31,9 @@ flarum-tags:
 
     # These translations are used in the Permissions page of the admin interface.
     permissions:
+      allow_edit_tags_label: Allow tag editing
       restrict_by_tag_heading: Restrict by Tag
       tag_discussions_label: Tag discussions
-      allow_edit_tags_label: Allow tag editing
 
     # These translations are used in the Tag Settings modal dialog.
     tag_settings:
@@ -73,8 +73,8 @@ flarum-tags:
 
     # These translations are used on the index page, peripheral to the discussion list.
     index:
-      tags_link: => flarum-tags.ref.tags
       more_link: More...
+      tags_link: => flarum-tags.ref.tags
       untagged_link: Untagged
 
     # These translations are displayed between posts in the post stream.