diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0ca237fbb..db117b464 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,12 +1,16 @@
 ---
 en:
+  contact_prompts:
+    if_any_questions_html: <a href="/contact">Contact us</a> if you have any questions.
+    if_continued_trouble_html: <a href="/contact">Contact us</a> if you continue having trouble.
+    if_we_can_help_html: <a href="/contact">Contact us</a> if there is anything we can help with.
   core:
     add_comment: Add comment
     all: All
     analytics: Analytics
     comment: Comment
-    copy_link: Copy link
     community_name_is_great: "%{community_name} is great!"
+    copy_link: Copy link
     create_account: Create account
     create_post: Create Post
     dashboard: Dashboard
@@ -18,7 +22,7 @@ en:
     follower: Follower
     followers: Followers
     following: Following
-    following_tags: "Following tags"
+    following_tags: Following tags
     full: Full
     home: Home
     infinity: Infinity
@@ -34,8 +38,8 @@ en:
     month: Month
     more_from: More from
     my_tags: My Tags
-    pinned: Pinned
     on_video: "%{name} on Video"
+    pinned: Pinned
     popular_tags: Popular Tags
     post: Post
     posts: Posts
@@ -57,17 +61,13 @@ en:
     settings: Settings
     share_to: Share to %{media}
     sign_out: Sign Out
-    tags: "Tags"
-    tags_to_follow: "Tags to follow on %{community_name}"
-    top_tags: "Top tags"
+    tags: Tags
+    tags_to_follow: Tags to follow on %{community_name}
+    top_tags: Top tags
     trending_on: Trending on
     view: View
     week: Week
     year: Year
-  contact_prompts:
-    if_continued_trouble_html: <a href="/contact">Contact us</a> if you continue having trouble.
-    if_we_can_help_html: <a href="/contact">Contact us</a> if there is anything we can help with.
-    if_any_questions_html: <a href="/contact">Contact us</a> if you have any questions.
   dashboard:
     empty_follower: You don't have any followers yet...
     empty_post: This is where you can manage your posts, but you haven't written anything yet.
@@ -111,10 +111,6 @@ en:
       wrong_length:
         one: is the wrong length (should be 1 character)
         other: is the wrong length (should be %{count} characters)
-  videos:
-    new:
-      title: 🎥 Upload Video File 🙌
-      beta_info_html: <strong>Video is beta:</strong>
   podcasts:
     statuses:
       ssl_failed: SSL certificate verify failed while fetching podcast's feed_url
@@ -122,14 +118,18 @@ en:
       unplayable: This podcast may not be playable in the browser
       unreachable: Podcast's feed_url is not reachable
   settings_menu:
-    profile: "Profile"
-    customization: "Customization"
-    notifications: "Notifications"
-    account: "Account"
-    billing: "Billing"
-    organization: "Organization"
-    extensions: "Extensions"
+    account: Account
+    billing: Billing
+    customization: Customization
+    extensions: Extensions
+    notifications: Notifications
+    organization: Organization
+    profile: Profile
   time:
     formats:
       short: "%b %-e"
       short_with_year: "%b %-e, %Y"
+  videos:
+    new:
+      beta_info_html: "<strong>Video is beta:</strong>"
+      title: "\U0001F3A5 Upload Video File \U0001F64C"
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index acf0ba18e..07f21bedf 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1,5 +1,9 @@
 ---
 fr:
+  contact_prompts:
+    if_any_questions_html: <a href="/contact">Contactez-nous</a> si vous avez des questions.
+    if_continued_trouble_html: <a href="/contact">Contactez-nous</a> si vous continuez à avoir des problèmes.
+    if_we_can_help_html: <a href="/contact">Contactez-nous</a> si nous pouvons vous aider.
   core:
     add_comment: Ajouter un commentaire
     all: Tout
@@ -34,8 +38,8 @@ fr:
     month: Mois
     more_from: Plus de la part de
     my_tags: Mes sujets
-    pinned: Épinglé
     on_video: "%{name} en Vidéo"
+    pinned: Épinglé
     popular_tags: Sujets populaires
     post: Publication
     posts: Publications
@@ -64,10 +68,6 @@ fr:
     view: Vue
     week: Semaine
     year: Année
-  contact_prompts:
-    if_continued_trouble_html: <a href="/contact">Contactez-nous</a> si vous continuez à avoir des problèmes.
-    if_we_can_help_html: <a href="/contact">Contactez-nous</a> si nous pouvons vous aider.
-    if_any_questions_html: <a href="/contact">Contactez-nous</a> si vous avez des questions.
   dashboard:
     empty_follower: Vous n'avez pas encore d'abonnés...
     empty_post: C'est ici que vous pouvez gérer vos messages, mais vous n'avez encore rien écrit
@@ -79,7 +79,7 @@ fr:
     write_new_post: Écrivez votre premier message maintenant
   date:
     abbr_month_names:
-    -
+    - 
     - janv
     - févr
     - mars
@@ -134,10 +134,6 @@ fr:
       wrong_length:
         one: est la mauvaise longueur (devrait être 1 caractère)
         other: est la mauvaise longueur (devrait être %{count} caractères)
-  videos:
-    new:
-      title: 🎥 Télécharger un fichier vidéo 🙌
-      beta_info_html: <strong>Vidéo est en bêta:</strong>
   podcasts:
     statuses:
       ssl_failed: Échec de la vérification du certificat SSL lors de la récupération de feed_url du podcast
@@ -145,14 +141,18 @@ fr:
       unplayable: Ce podcast peut ne pas être lisible dans le navigateur
       unreachable: Le feed_url du podcast n'est pas accessible
   settings_menu:
-    profile: Profil
-    customization: Personnalisation
-    notifications: Notifications
     account: Compte
     billing: Facturation
-    organization: Organisation
+    customization: Personnalisation
     extensions: Extensions
+    notifications: Notifications
+    organization: Organisation
+    profile: Profil
   time:
     formats:
       short: "%-e %b"
       short_with_year: "%-e %b, %Y"
+  videos:
+    new:
+      beta_info_html: "<strong>Vidéo est en bêta:</strong>"
+      title: "\U0001F3A5 Télécharger un fichier vidéo \U0001F64C"