Merge remote-tracking branch 'upstream/master' into feature-popup

app/build.gradle

@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion '23.0.3'
+    buildToolsVersion '25.0.0'
 
     defaultConfig {
         applicationId "org.schabi.newpipe"

app/src/main/res/values-id/strings.xml

@@ -296,15 +296,15 @@
     <string name="black_theme_title">Hitam</string>
 
     <string name="all">Semua</string>
-    <string name="channel">Channel</string>
+    <string name="channel">Saluran</string>
 
     <string name="videos">video</string>
     <string name="views">ditonton</string>
-    <string name="short_thousand">K</string>
-    <string name="short_million">M</string>
-    <string name="short_billion">B</string>
+    <string name="short_thousand">R</string>
+    <string name="short_million">J</string>
+    <string name="short_billion">T</string>
 
-    <string name="subscriber">subscriber</string>
+    <string name="subscriber">pelanggan</string>
     <string name="yes">Ya</string>
     <string name="later">Nanti</string>
 

app/src/main/res/values-it/strings.xml

@@ -318,4 +318,14 @@
 
     <string name="recaptcha_request_toast">Richiesta sfida reCAPTCHA</string>
 
+    <string name="yes">Si</string>
+    <string name="later">Più tardi</string>
+
+    <string name="subscribe">Iscriviti</string>
+    <string name="restart_title">Riavvia</string>
+
+    <string name="msg_restart">L\'applicazione deve essere riavviata per applicare il tema.
+
+Vuoi riavviare l\'app ora?</string>
+
     </resources>

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sat Aug 20 00:40:54 CEST 2016
+#Tue Mar 07 14:05:42 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip