diff --git a/src/App.vue b/src/App.vue
index 8f026b62..e853f392 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -18,7 +18,7 @@
              
             <a href="https://github.com/TeamPiped/Piped#donations">
                 <font-awesome-icon :icon="['fab', 'bitcoin']"></font-awesome-icon>
-                Donations
+                {{ $t("actions.donations") }}
             </a>
         </div>
     </div>
diff --git a/src/components/Channel.vue b/src/components/Channel.vue
index 5e649e58..25123781 100644
--- a/src/components/Channel.vue
+++ b/src/components/Channel.vue
@@ -13,7 +13,7 @@
             style="background: #222"
             type="button"
         >
-            {{ subscribed ? "Unsubscribe" : "Subscribe" }}
+            {{ subscribed ? $t("actions.unsubscribe") : $t("actions.subscribe") }}
         </button>
 
         <hr />
diff --git a/src/components/Comment.vue b/src/components/Comment.vue
index 9b4262eb..660ca7b0 100644
--- a/src/components/Comment.vue
+++ b/src/components/Comment.vue
@@ -11,7 +11,7 @@
     <div class="comment-content">
       <div class="comment-header">
         <div v-if="comment.pinned" class="comment-pinned uk-text-meta">
-          <font-awesome-icon icon="thumbtack"></font-awesome-icon>&nbsp; Pinned by
+          <font-awesome-icon icon="thumbtack"></font-awesome-icon>&nbsp; {{ $t("comment.pinned_by") }} 
           {{ uploader }}
         </div>
 
diff --git a/src/components/ErrorHandler.vue b/src/components/ErrorHandler.vue
index a32a1877..988559c8 100644
--- a/src/components/ErrorHandler.vue
+++ b/src/components/ErrorHandler.vue
@@ -1,7 +1,7 @@
 <template>
     <p>{{ message }}</p>
     <button uk-toggle="target: #stacktrace" class="uk-button uk-button-small" style="background: #222" type="button">
-        Show More
+        {{ $t("actions.show_more") }}
     </button>
     <p id="stacktrace" style="white-space: pre-wrap" hidden>{{ error }}</p>
 </template>
diff --git a/src/components/HistoryPage.vue b/src/components/HistoryPage.vue
index 0a87a796..1e7a7211 100644
--- a/src/components/HistoryPage.vue
+++ b/src/components/HistoryPage.vue
@@ -2,12 +2,12 @@
     <h1 class="uk-text-bold uk-text-center">Watch History</h1>
 
     <br />
-    Sort by:
+    {{ $t("actions.sort_by") }}
     <select class="uk-select uk-width-auto" v-model="selectedSort" @change="onChange()">
-        <option value="descending">Most Recent</option>
-        <option value="ascending">Least Recent</option>
-        <option value="channel_ascending">Channel Name (A-Z)</option>
-        <option value="channel_descending">Channel Name (Z-A)</option>
+        <option value="descending" v-t="'actions.most_recent'" />
+        <option value="ascending" v-t="'actions.least_recent'" />
+        <option value="channel_ascending" v-t="'actions.channel_name_asc'" />
+        <option value="channel_descending" v-t="'actions.channel_name_desc'" />
     </select>
 
     <hr />
diff --git a/src/components/LoginPage.vue b/src/components/LoginPage.vue
index 795a63a1..040fddcc 100644
--- a/src/components/LoginPage.vue
+++ b/src/components/LoginPage.vue
@@ -24,7 +24,7 @@
                     class="uk-width-1-1 uk-button uk-button-primary uk-button-large uk-width-auto"
                     style="background: #222"
                     @click="login"
-                    >Login</a
+                    > {{ $t('titles.login') }} </a
                 >
             </div>
         </form>
diff --git a/src/components/Playlist.vue b/src/components/Playlist.vue
index 14c943ff..e3a131e1 100644
--- a/src/components/Playlist.vue
+++ b/src/components/Playlist.vue
@@ -15,7 +15,7 @@
         >
 
         <div class="uk-align-right">
-            <b>{{ playlist.videos }} Videos</b>
+            <b>{{ playlist.videos }} {{ $t("video.videos") }}</b>
             <br />
             <a :href="getRssUrl"><font-awesome-icon icon="rss"></font-awesome-icon></a>
         </div>
diff --git a/src/components/Preferences.vue b/src/components/Preferences.vue
index 7da2e88f..1f2f45bb 100644
--- a/src/components/Preferences.vue
+++ b/src/components/Preferences.vue
@@ -85,7 +85,7 @@
     <br />
     <input class="uk-checkbox" v-model="showComments" @change="onChange($event)" type="checkbox" />
     <br />
-    <b v-t="'actions.minimize_description'" />
+    <b v-t="'actions.minimize_description_default'" />
     <br />
     <input class="uk-checkbox" v-model="minimizeDescription" @change="onChange($event)" type="checkbox" />
     <br />
@@ -110,17 +110,17 @@
     <table class="uk-table">
         <thead>
             <tr>
-                <th>Instance Name</th>
-                <th>Instance Locations</th>
-                <th>Has CDN?</th>
-                <th>SSL Score</th>
+                <th>{{ $t("preferences.instance_name") }}</th>
+                <th>{{ $t("preferences.instance_locations") }}</th>
+                <th>{{ $t("preferences.has_cdn") }}</th>
+                <th>{{ $t("preferences.ssl_score") }}</th>
             </tr>
         </thead>
         <tbody v-bind:key="instance.name" v-for="instance in instances">
             <tr>
                 <td>{{ instance.name }}</td>
                 <td>{{ instance.locations }}</td>
-                <td>{{ instance.cdn }}</td>
+                <td>{{ instance.cdn == "Yes"? $t("actions.yes") : $t("actions.no") }}</td>
                 <td>
                     <a :href="sslScore(instance.apiurl)" target="_blank">Click Here</a>
                 </td>
@@ -130,7 +130,7 @@
 
     <hr />
 
-    <b>Instance Selection:</b>
+    <b>{{ $t("actions.instance_selection") }}:</b>
     <br />
     <select class="uk-select uk-width-auto" v-model="selectedInstance" @change="onChange($event)">
         <option v-bind:key="instance.name" v-for="instance in instances" v-bind:value="instance.apiurl">
diff --git a/src/components/RegisterPage.vue b/src/components/RegisterPage.vue
index 79f9d0a3..a4851e63 100644
--- a/src/components/RegisterPage.vue
+++ b/src/components/RegisterPage.vue
@@ -24,7 +24,7 @@
                     class="uk-width-1-1 uk-button uk-button-primary uk-button-large uk-width-auto"
                     style="background: #222"
                     @click="register"
-                    >Register</a
+                    > {{ $t("titles.register") }}</a
                 >
             </div>
         </form>
diff --git a/src/components/SearchResults.vue b/src/components/SearchResults.vue
index 38721d06..6be2e5e3 100644
--- a/src/components/SearchResults.vue
+++ b/src/components/SearchResults.vue
@@ -57,13 +57,13 @@
                 </b>
 
                 <a v-if="result.uploaderName" class="uk-text-muted">{{ result.uploaderName }}</a>
-                <b v-if="result.videos >= 0"><br v-if="result.uploaderName" />{{ result.videos }} Videos</b>
+                <b v-if="result.videos >= 0"><br v-if="result.uploaderName" />{{ result.videos }} {{ $t("video.videos") }}</b>
 
                 <br />
 
                 <b v-if="result.views >= 0" class="uk-text-small">
                     <font-awesome-icon icon="eye"></font-awesome-icon>
-                    {{ numberFormat(result.views) }} views
+                    {{ numberFormat(result.views) }} {{ $t("video.views") }}
                 </b>
             </div>
         </div>
diff --git a/src/components/SubscriptionsPage.vue b/src/components/SubscriptionsPage.vue
index 684ac9d4..d6128e71 100644
--- a/src/components/SubscriptionsPage.vue
+++ b/src/components/SubscriptionsPage.vue
@@ -8,7 +8,7 @@
         style="background: #222"
         type="button"
     >
-        Export to JSON
+        {{ $t("actions.export_to_json") }}
     </button>
 
     <div :key="subscription.url" v-for="subscription in subscriptions">
@@ -23,7 +23,7 @@
                 type="button"
                 @click="handleButton(subscription)"
             >
-                {{ subscription.subscribed ? "Unsubscribe" : "Subscribe" }}
+                {{ subscription.subscribed ? $t("actions.unsubscribe") : $t("actions.subscribe") }}
             </button>
         </div>
     </div>
diff --git a/src/components/VideoItem.vue b/src/components/VideoItem.vue
index 9c8bc883..a8a4c09d 100644
--- a/src/components/VideoItem.vue
+++ b/src/components/VideoItem.vue
@@ -20,7 +20,7 @@
                     v-if="video.watched"
                     class="uk-label uk-border-rounded uk-position-absolute video-duration"
                     style="bottom: 5px; left: 5px; background: rgba(0, 0, 0, .75); color: white; padding: 0 5px;"
-                    >Watched</span
+                    >{{ $t("video.watched") }}</span
                 >
             </div>
             <p class="uk-text-break">{{ video.title }}</p>
@@ -41,7 +41,7 @@
         <b v-if="video.views >= 0 || video.uploadedDate" class="uk-text-small uk-align-left">
             <div v-if="video.views >= 0">
                 <font-awesome-icon icon="eye"></font-awesome-icon>
-                {{ numberFormat(video.views) }} views
+                {{ numberFormat(video.views) }} {{ $t("video.views") }}
                 <br />
             </div>
             <div v-if="video.uploadedDate">
diff --git a/src/components/WatchVideo.vue b/src/components/WatchVideo.vue
index cf1efdaa..2360b5d5 100644
--- a/src/components/WatchVideo.vue
+++ b/src/components/WatchVideo.vue
@@ -75,20 +75,20 @@
             <hr />
 
             <a class="uk-button uk-button-small" style="background: #222" @click="showDesc = !showDesc">
-                {{ showDesc ? "Minimize Description" : "Show Description" }}
+                {{ showDesc ? $t("actions.minimize_description") : $t("actions.show_description") }}
             </a>
             <p v-show="showDesc" :style="[{ colour: foregroundColor }]" v-html="video.description"></p>
             <div v-if="showDesc && sponsors && sponsors.segments">
-                Sponsors Segments: {{ sponsors.segments.length }}
+                {{ $t("video.sponsor_segments") }}: {{ sponsors.segments.length }}
             </div>
         </div>
 
         <hr />
 
-        <b>Loop this Video:</b>&nbsp;
+        <b>{{ $t("actions.loop_this_video") }}:</b>&nbsp;
         <input class="uk-checkbox" v-model="selectedAutoLoop" @change="onChange($event)" type="checkbox" />
         <br />
-        <b>Auto Play next Video:</b>&nbsp;
+        <b>{{ $t("actions.auto_play_next_video") }}:</b>&nbsp;
         <input class="uk-checkbox" v-model="selectedAutoPlay" @change="onChange($event)" type="checkbox" />
 
         <hr />
diff --git a/src/locales/bn.json b/src/locales/bn.json
index 43c0488f..26de41b9 100644
--- a/src/locales/bn.json
+++ b/src/locales/bn.json
@@ -40,7 +40,7 @@
         "country_selection": "দেশ",
         "default_homepage": "ওয়েবসাইট খোলার পর কি দেখবেন গতানুগতিক",
         "show_comments": "আপনি কি মন্তব্য দেখতে চান ?",
-        "minimize_description": "আপনি কি স্বাভাবিক ভাবে বিবরণটিকে সংক্ষিপ্ত রাখতে চান ?",
+        "minimize_description_default": "আপনি কি স্বাভাবিক ভাবে বিবরণটিকে সংক্ষিপ্ত রাখতে চান ?",
         "store_watch_history": "আপনি কি দেখার ইতিহাস মজুত রাখতে চান?",
         "language_selection": "আপনি কোন ভাষায় দেখতে চান ?",
         "instances_list": "Instances List",
diff --git a/src/locales/de.json b/src/locales/de.json
index 4253f84d..c6fa544d 100644
--- a/src/locales/de.json
+++ b/src/locales/de.json
@@ -8,7 +8,7 @@
         "instances_list": "Liste der Instanzen",
         "language_selection": "Sprachauswahl",
         "store_watch_history": "Wiedergabeverlauf speichern",
-        "minimize_description": "Beschreibung standardmäßig minimieren",
+        "minimize_description_default": "Beschreibung standardmäßig minimieren",
         "show_comments": "Kommentare anzeigen",
         "default_homepage": "Standard-Startseite",
         "country_selection": "Länderauswahl",
diff --git a/src/locales/el.json b/src/locales/el.json
index c9793873..1e2a3f1d 100644
--- a/src/locales/el.json
+++ b/src/locales/el.json
@@ -19,7 +19,7 @@
         "uses_api_from": "Χρήση API από ",
         "view_subscriptions": "Προβολή συνδρομών",
         "language_selection": "Επιλογή γλώσσας",
-        "minimize_description": "Ελαχιστοποίηση περιγραφής από προεπιλογή",
+        "minimize_description_default": "Ελαχιστοποίηση περιγραφής από προεπιλογή",
         "show_comments": "Εμφάνιση σχολίων",
         "buffering_goal": "Στόχος Buffering (σε δευτερόλεπτα)",
         "default_quality": "Προεπιλεγμένη ποιότητα",
diff --git a/src/locales/en.json b/src/locales/en.json
index 79c9c85f..32dba805 100644
--- a/src/locales/en.json
+++ b/src/locales/en.json
@@ -40,10 +40,35 @@
         "country_selection": "Country Selection",
         "default_homepage": "Default Homepage",
         "show_comments": "Show Comments",
-        "minimize_description": "Minimize Description by default",
+        "minimize_description_default": "Minimize Description by default",
         "store_watch_history": "Store Watch History",
         "language_selection": "Language Selection",
         "instances_list": "Instances List",
-        "enabled_codecs": "Enabled Codecs (Multiple)"
+        "enabled_codecs": "Enabled Codecs (Multiple)",
+        "instance_selection": "Instance Selection",
+        "show_more": "Show More",
+        "yes": "Yes",
+        "no": "No",
+        "export_to_json": "Export to JSON",
+        "loop_this_video": "Loop this Video",
+        "auto_play_next_video": "Auto Play next Video",
+        "donations": "Donations",
+        "minimize_description": "Minimize Description",
+        "show_description": "Show Description"
+    },
+    "comment": {
+        "pinned_by": "Pinned by"
+    },
+    "preferences": {
+        "instance_name":"Instance Name",
+        "instance_locations":"Instance Locations",
+        "has_cdn":"Has CDN?",
+        "ssl_score":"SSL Score"
+    },
+    "video": {
+        "videos": "Videos",
+        "views": "views",
+        "watched": "Watched",
+        "sponsor_segments": "Sponsors Segments"
     }
 }
diff --git a/src/locales/fa.json b/src/locales/fa.json
index b4cc8139..cc1bb40c 100644
--- a/src/locales/fa.json
+++ b/src/locales/fa.json
@@ -4,7 +4,7 @@
         "instances_list": "لیست نمونه‌ها",
         "language_selection": "انتخاب زبان",
         "store_watch_history": "ذخیره سابقه تماشا",
-        "minimize_description": "به حداقل رساندن توضیحات به صورت پیش فرض",
+        "minimize_description_default": "به حداقل رساندن توضیحات به صورت پیش فرض",
         "show_comments": "نمایش نظرات",
         "default_homepage": "صفحه خانگی پیش فرض",
         "country_selection": "انتخاب کشور",
diff --git a/src/locales/fr.json b/src/locales/fr.json
index cf1c1580..8b90c4a7 100644
--- a/src/locales/fr.json
+++ b/src/locales/fr.json
@@ -21,7 +21,7 @@
         "instances_list": "Liste des instances",
         "language_selection": "Sélection de la langue",
         "store_watch_history": "Conserver l'historique de visionnage",
-        "minimize_description": "Minimiser la description par défaut",
+        "minimize_description_default": "Minimiser la description par défaut",
         "show_comments": "Afficher les commentaires",
         "default_homepage": "Page d'accueil par défaut",
         "country_selection": "Sélection du pays",
diff --git a/src/locales/it.json b/src/locales/it.json
index 3b536f41..663bd408 100644
--- a/src/locales/it.json
+++ b/src/locales/it.json
@@ -3,7 +3,7 @@
         "instances_list": "Elenco delle istanze",
         "language_selection": "Selezione della lingua",
         "store_watch_history": "Conserva la cronologia di visualizzazione",
-        "minimize_description": "Minimizza la descrizione per impostazione predefinita",
+        "minimize_description_default": "Minimizza la descrizione per impostazione predefinita",
         "show_comments": "Mostra i commenti",
         "default_homepage": "Pagina iniziale predefinita",
         "country_selection": "Selezione del paese",
diff --git a/src/locales/lt.json b/src/locales/lt.json
index eac0feb2..9b074f17 100644
--- a/src/locales/lt.json
+++ b/src/locales/lt.json
@@ -5,7 +5,7 @@
         "instances_list": "Perdavimo šaltinių sąrašas",
         "language_selection": "Kalbos pasirinkimas",
         "store_watch_history": "Saugoti žiūrėjimo istoriją",
-        "minimize_description": "Suskleisti aprašymą automatiškai",
+        "minimize_description_default": "Suskleisti aprašymą automatiškai",
         "show_comments": "Rodyti komentarus",
         "default_homepage": "Numatytasis pagrindinis puslapis",
         "country_selection": "Šalies pasirinkimas",
diff --git a/src/locales/ml.json b/src/locales/ml.json
index f00ef361..edf016c8 100644
--- a/src/locales/ml.json
+++ b/src/locales/ml.json
@@ -12,7 +12,7 @@
         "unsubscribe": "സബ്സ്ക്രൈബ് ചെയ്യേണ്ട",
         "subscribe": "സബ്സ്ക്രൈബ് ചെയ്യുക",
         "instances_list": "ഇൻസ്റ്റൻസുകളുടെ പട്ടിക",
-        "minimize_description": "സ്ഥിരമായി വിവരണം ചെറുതാക്കുക",
+        "minimize_description_default": "സ്ഥിരമായി വിവരണം ചെറുതാക്കുക",
         "skip_intro": "ഇടവേള/ആമുഖ ആനിമേഷൻ ഒഴിവാക്കുക",
         "skip_sponsors": "സ്പോൺസർമാരെ ഒഴിവാക്കുക",
         "default_quality": "സ്ഥിര വീഡിയോ നിലവാരം",
diff --git a/src/locales/nb_NO.json b/src/locales/nb_NO.json
index d821c8c7..f6ae9c56 100644
--- a/src/locales/nb_NO.json
+++ b/src/locales/nb_NO.json
@@ -1,7 +1,7 @@
 {
     "actions": {
         "instances_list": "Liste over instanser",
-        "minimize_description": "Minimer beskrivelse som forvalg",
+        "minimize_description_default": "Minimer beskrivelse som forvalg",
         "country_selection": "Land",
         "buffering_goal": "Mellomlagringsmål (i sekunder)",
         "autoplay_video": "Spill video automatisk",
diff --git a/src/locales/tr.json b/src/locales/tr.json
index b26a6640..238195a2 100644
--- a/src/locales/tr.json
+++ b/src/locales/tr.json
@@ -3,7 +3,7 @@
         "instances_list": "Örnek Listesi",
         "language_selection": "Dil Seçimi",
         "store_watch_history": "İzleme Geçmişini Sakla",
-        "minimize_description": "Açıklamayı öntanımlı olarak küçült",
+        "minimize_description_default": "Açıklamayı öntanımlı olarak küçült",
         "show_comments": "Yorumları Göster",
         "default_homepage": "Öntanımlı Ana Sayfa",
         "country_selection": "Ülke Seçimi",