diff --git a/README.md b/README.md
index 5fb4bed4d..66ce57919 100644
--- a/README.md
+++ b/README.md
@@ -3,13 +3,13 @@
 [![Translation Status](https://hosted.weblate.org/widgets/NewPipe/-/svg-badge.svg)](https://hosted.weblate.org/engage/NewPipe/)
 
 [![NewPipe](https://f-droid.org/repo/icons/org.schabi.newpipe.4.png)](http://dasochan.nl/newpipe/)
-NewPipe: A free lightweight Youtube fronted for Android.
+NewPipe: A free lightweight Youtube frontend for Android.
 
 [![F-Droid](https://f-droid.org/wiki/images/0/06/F-Droid-button_get-it-on.png)](https://f-droid.org/repository/browse/?fdfilter=newpipe&fdid=org.schabi.newpipe)
 
 ## Description
 
-NewPipe does not use any Google framework libraries, or the Youtube api. It only parses the website in order to gain the information it needs. Therefore this app can be used on devices without g-services installed. Also NewPipe does not store data on the Youtube website (no login), and it's free software.
+NewPipe does not use any Google framework libraries, or the YouTube API. It only parses the website in order to gain the information it needs. Therefore this app can be used on devices without G-services installed. Also NewPipe does not store data on the YouTube website (no login), and it's free software.
 
 ## Features
 
@@ -37,9 +37,9 @@ NewPipe does not use any Google framework libraries, or the Youtube api. It only
 * ... and many more
 
 ### Multi service support
-Generally NewPipe is designed to not only support YouTube, but many more streaming services. How ever, right now NewPipe is not stable enough to support more than only youtube. But if all works as plant, NewPipe will get such support by the version 2.0.
+Generally NewPipe is designed to not only support YouTube, but many more streaming services. However, right now NewPipe is not stable enough to support more than only YouTube. But if all works as planned, NewPipe will get such support by the version 2.0.
 
 # Help is always welcome !!!
-Whether its about ideas, translation, design changes, code cleaning, or real heavy code changes. Help is always welcome.
+Whether it's about ideas, translation, design changes, code cleaning, or real heavy code changes. Help is always welcome.
 
 The more is done the better it gets!
diff --git a/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java b/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
index 4b83dd0a3..d51cbdc49 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoItemListFragment.java
@@ -1,6 +1,6 @@
 package org.schabi.newpipe;
 
-import android.app.Activity;
+import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
@@ -301,15 +301,15 @@ public class VideoItemListFragment extends ListFragment {
     }
 
     @Override
-    public void onAttach(Activity activity) {
-        super.onAttach(activity);
+    public void onAttach(Context context) {
+        super.onAttach(context);
 
         // Activities containing this fragment must implement its callbacks.
-        if (!(activity instanceof Callbacks)) {
+        if (!(context instanceof Callbacks)) {
             throw new IllegalStateException("Activity must implement fragment's callbacks.");
         }
 
-        mCallbacks = (Callbacks) activity;
+        mCallbacks = (Callbacks) context;
     }
 
     @Override
diff --git a/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java b/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java
index ea69be538..c174528c6 100644
--- a/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java
+++ b/app/src/main/java/org/schabi/newpipe/VideoListAdapter.java
@@ -2,6 +2,7 @@ package org.schabi.newpipe;
 
 import android.content.Context;
 import android.graphics.Bitmap;
+import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -99,7 +100,7 @@ public class VideoListAdapter extends BaseAdapter {
         convertView = viewCreator.getViewByVideoInfoItem(convertView, parent, videoList.get(position));
 
         if(listView.isItemChecked(position)) {
-            convertView.setBackgroundColor(context.getResources().getColor(R.color.primaryColorYoutube));
+            convertView.setBackgroundColor(ContextCompat.getColor(context,R.color.primaryColorYoutube));
         } else {
             convertView.setBackgroundColor(0);
         }
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f9743430a..52b92621a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
     <string name="app_name">NewPipe</string>
     <string name="title_videoitem_detail">NewPipe</string>
@@ -26,7 +26,7 @@
     <string name="downloadLocation">Download Verzeichnis</string>
     <string name="downloadLocationSummary">Verzeichnis in dem heruntergeladene Videos gespeichert werden.</string>
     <string name="downloadLocationDialogTitle">Download Verzeichnis eingeben</string>
-    <string name="autoPlayThroughIntentTitle">Automatisch abspielen durch Intent.</string>
+    <string name="autoPlayThroughIntentTitle">Automatisches abspielen durch Intent</string>
     <string name="autoPlayThroughIntentSummary">Startet ein Video automatisch wenn es von einer anderen App aufgerufen wurde.</string>
     <string name="defaultResolutionPreferenceTitle">Standard Auflösung</string>
     <string name="playWithKodiTitle">Mit Kodi abspielen</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
new file mode 100644
index 000000000..b24529f59
--- /dev/null
+++ b/app/src/main/res/values-fa/strings.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">NewPipe</string>
+    <string name="title_videoitem_detail">NewPipe</string>
+    <string name="nothingFound">چیزی پیدا نشد</string>
+    <string name="viewSufix">نماها</string>
+    <string name="uploadDatePrefix">بارگذاری‌شده در: </string>
+    <string name="noPlayerFound">هیچ پخش‌کننده‌ی جریانی یافت نشد. ممکن است بخواهید یکی نصب کنید.</string>
+    <string name="installStreamPlayer">نصب کنید</string>
+    <string name="cancel">انصراف</string>
+    <string name="fdroidVLCurl">https://f-droid.org/repository/browse/?fdfilter=vlc&amp;fdid=org.videolan.vlc</string>
+    <string name="open_in_browser">بازکردن در مرورگر</string>
+    <string name="share">هم‌رسانی</string>
+    <string name="play">پخش</string>
+    <string name="download">بارگیری</string>
+    <string name="search">جستجو</string>
+    <string name="settings">تنظیمات</string>
+    <string name="sendWith">فرستادن با</string>
+    <string name="didYouMean">منظورتان این است: </string>
+    <string name="searchPage">صفحه‌ی جستجو: </string>
+    <string name="shareDialogTitle">هم‌رسانی با:</string>
+    <string name="chooseBrowser">مرورگر را برگزینید:</string>
+    <string name="screenRotation">چرخش</string>
+    <string name="title_activity_settings">تنظیمات</string>
+    <string name="useExternalPlayerTitle">استفاده از پخش‌کننده‌ی خارجی</string>
+    <string name="downloadLocation">محل بارگیری</string>
+    <string name="downloadLocationSummary">مسیری که ویدئوهای دریافت شده در آن ذخیره می‌شوند.</string>
+    <string name="downloadLocationDialogTitle">مسیر دریافت را وارد کنید</string>
+    <string name="autoPlayThroughIntentTitle">پخش خودکار از Intent</string>
+    <string name="autoPlayThroughIntentSummary">ویدئو هنگامی که از برنامه‌ی دیگری فراخوانده شد خودکار پخش می‌شود.</string>
+    <string name="defaultResolutionPreferenceTitle">وضوح پیش‌فرض</string>
+    <string name="playWithKodiTitle">پخش با Kodi</string>
+    <string name="koreNotFound">برنامه‌ی Kore نصب نیست. برای پخش کردن ویدئوها با مرکز رسانه‌ی Kodi، به Kore نیاز دارید.</string>
+    <string name="installeKore">نصب Kore</string>
+    <string name="fdroidKoreUrl">https://f-droid.org/repository/browse/?fdfilter=Kore&amp;fdid=org.xbmc.kore</string>
+    <string name="showPlayWithKodiTitle">نمایش گزینه‌ی «پخش با Kodi»</string>
+    <string name="showPlayWithKodiSummary">گزینه‌ای برای پخش کردن ویدئو با مرکز رسانه‌ی Kodi نشان می‌دهد.</string>
+    <string name="leftPlayButtonTitle">نمایش دکمه‌ی پخش در سمت چپ.</string>
+    <string name="playAudio">صدا</string>
+    <string name="defaultAudioFormatTitle">قالب پیش‌فرض صدا</string>
+    <string name="webMAudioDescription">WebM - قالبی آزاد</string>
+    <string name="m4aAudioDescription">m4a - کیفیت بهتر</string>
+    <string name="downloadDialogTitle">دریافت</string>
+    <string-array name="downloadOptions">
+        <item>ویدئو</item>
+        <item>صدا</item>
+    </string-array>
+    <string name="nextVideoTitle">ویدئوی بعدی</string>
+    <string name="showNextVideoTitle">نمایش گزینه‌ی «ویدئوی بعدی».</string>
+    <string name="urlNotSupportedText">پیوند پشتیبانی نمی‌شود.</string>
+</resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 5ffe1d639..e2934c4e7 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
     <string name="app_name">NewPipe</string>
     <string name="title_videoitem_detail">NewPipe</string>
@@ -45,4 +45,7 @@
         <item>Videó</item>
         <item>Hang</item>
     </string-array>
+<string name="nextVideoTitle">Következő videó</string>
+    <string name="showNextVideoTitle">\"Következő videó\" elem mutatása</string>
+    <string name="urlNotSupportedText">A webcím nem támogatott.</string>
 </resources>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 690822ff2..68934272c 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='utf-8'?>
 <resources>
     <string name="app_name">Јутјуб цев</string>
     <string name="title_videoitem_detail">Јутјуб цев</string>
@@ -45,4 +45,7 @@
         <item>Видео</item>
         <item>Аудио</item>
     </string-array>
-</resources>
\ No newline at end of file
+<string name="nextVideoTitle">Следећи видео</string>
+    <string name="showNextVideoTitle">Приказ ставке „Следећи видео“.</string>
+    <string name="urlNotSupportedText">УРЛ није подржан.</string>
+</resources>