diff --git a/ember/app/templates/components/pin-button.hbs b/ember/app/templates/components/pin-button.hbs
index 3c26023a01..47c31c35e2 100644
--- a/ember/app/templates/components/pin-button.hbs
+++ b/ember/app/templates/components/pin-button.hbs
@@ -1,5 +1,5 @@
 {{#if pinned}}
-  <i class='icon-star icon-large'></i> Flight pinned!
+  <i class='icon-star icon-large'></i> {{t 'flight-pinned'}}
 {{else}}
-  <i class='icon-star-empty icon-large'></i> Click to pin
+  <i class='icon-star-empty icon-large'></i> {{t 'flight-unpinned'}}
 {{/if}}
diff --git a/ember/app/templates/components/settings-panels/tracking-key.hbs b/ember/app/templates/components/settings-panels/tracking-key.hbs
index d7706f6dfe..a00b5ed2fe 100644
--- a/ember/app/templates/components/settings-panels/tracking-key.hbs
+++ b/ember/app/templates/components/settings-panels/tracking-key.hbs
@@ -10,7 +10,7 @@
   {{/if}}
 
   <p style="margin: 10px 0px 20px;">
-    Your Live Tracking key is: <span class="label tracking-key">{{key}}</span>
+    {{t 'your-live-tracking-key'}} <span class="label tracking-key">{{key}}</span>
   </p>
 
   <form {{action (perform saveTask) on="submit"}}>
diff --git a/ember/translations/en.yaml b/ember/translations/en.yaml
index 79c09e8150..04bda06dd6 100644
--- a/ember/translations/en.yaml
+++ b/ember/translations/en.yaml
@@ -69,7 +69,9 @@ first-name: First name
 flight-analysis: Flight Analysis
 flight-database: Flight Database
 flight-date-in-future: Date of flight in future
+flight-pinned: Flight pinned!
 flight-time: Flight Time
+flight-unpinned: Click to pin
 flights: Flights
 follow: Follow
 followers: Followers
@@ -206,6 +208,7 @@ year: Year
 'yes': 'Yes'
 you-have-no-notifications: You have no notifications.
 your-flights-have-been-saved: Your flights have been saved.
+your-live-tracking-key: 'Your Live Tracking key is:'
 about:
   welcome: Welcome to SkyLines, your internet platform for flight sharing!
   flights: <a href="{uploadURL}">Upload</a> your IGC files and share them with your friends. We won't change your files or restrict you from downloading them again!
diff --git a/ember/translations/fr.yaml b/ember/translations/fr.yaml
index 21b4d3780b..ff6010daa7 100644
--- a/ember/translations/fr.yaml
+++ b/ember/translations/fr.yaml
@@ -68,7 +68,9 @@ first-name: Prénom
 flight-analysis: Analyse des vols
 flight-database: Base de donnée des vols
 flight-date-in-future: Date de vol à venir
+flight-pinned: Vol épinglé !
 flight-time: Durée de vol
+flight-unpinned: Épinglez le vol
 flights: Vols
 follow: Suivre
 followers: Suivis par
@@ -205,6 +207,7 @@ year: Année
 'yes': Oui
 you-have-no-notifications: Vous n'avez pas de notification.
 your-flights-have-been-saved: Vos vols ont été enregistrés.
+your-live-tracking-key: 'Votre clé de live tracking est :'
 about:
   welcome: Bienvenue sur SkyLines, votre plateforme internet pour le partage de vols !
   flights: <a href="{uploadURL}">Téléchargez</a> vos fichiers IGC et partagez les avec vos amis. Nous ne les changerons pas, ni ne vous empêcherons de les télécharger encore !