Merge 077049d8ae into 07a6ba2381

build.gradle

@@ -14,7 +14,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0-beta2'
+        classpath 'com.android.tools.build:gradle:3.0.0-beta3'
         classpath 'com.google.gms:google-services:3.0.0'
     }
 }

src/main/res/values-ast/strings.xml

@@ -285,7 +285,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Xubir namái na Wi-Fi</string>
-    <string name="instant_video_upload_on_wifi">Xubir namái vídeos na Wi-Fi</string>
     <string name="instant_video_upload_on_charging">Namái xubir al cargar</string>
     <string name="instant_upload_on_charging">Namái xubir al cargar</string>
     <string name="instant_upload_path">/XubidaNelIntre</string>

src/main/res/values-cs-rCZ/strings.xml

@@ -323,7 +323,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Nahrávat pouze přes wifi</string>
-    <string name="instant_video_upload_on_wifi">Nahrávat videa pouze přes wifi</string>
     <string name="instant_video_upload_on_charging">Nahrávat pouze při nabíjení</string>
     <string name="instant_upload_on_charging">Nahrávat pouze při nabíjení</string>
     <string name="instant_upload_path">/InstantUpload</string>

src/main/res/values-de-rDE/strings.xml

@@ -332,7 +332,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Nur über W-Lan hochladen</string>
-    <string name="instant_video_upload_on_wifi">Videos nur über W-Lan hochladen</string>
     <string name="instant_video_upload_on_charging">Nur während des Ladens hochladen</string>
     <string name="instant_upload_on_charging">Nur während des Ladens hochladen</string>
     <string name="instant_upload_path">/SofortUpload</string>

src/main/res/values-de/strings.xml

@@ -332,7 +332,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Nur über W-Lan hochladen</string>
-    <string name="instant_video_upload_on_wifi">Videos nur über W-Lan hochladen</string>
     <string name="instant_video_upload_on_charging">Nur während des Ladens hochladen</string>
     <string name="instant_upload_on_charging">Nur während des Ladens hochladen</string>
     <string name="instant_upload_path">/SofortUpload</string>

src/main/res/values-el/strings.xml

@@ -323,7 +323,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Μεταφόρτωση μόνο μέσω wifi</string>
-    <string name="instant_video_upload_on_wifi">Μεταφόρτωση βίντεο μόνο μέσω wifi</string>
     <string name="instant_video_upload_on_charging">Μεταφόρτωση μόνο κατά τη διάρκεια φόρτισης</string>
     <string name="instant_upload_on_charging">Μεταφόρτωση μόνο κατά τη διάρκεια φόρτισης</string>
     <string name="instant_upload_path">/InstantUpload</string>

src/main/res/values-en-rGB/strings.xml

@@ -331,7 +331,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Only upload on Wi-Fi</string>
-    <string name="instant_video_upload_on_wifi">Only upload videos on Wi-Fi</string>
     <string name="instant_video_upload_on_charging">Only upload when charging</string>
     <string name="instant_upload_on_charging">Only upload when charging</string>
     <string name="instant_upload_path">/InstantUpload</string>

src/main/res/values-es-rAR/strings.xml

@@ -332,7 +332,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Cargar sólo mediante Wi-Fi</string>
-    <string name="instant_video_upload_on_wifi">Cargar videos sólo a través de Wi-Fi</string>
     <string name="instant_video_upload_on_charging">Cargar archivos sólo con el dispositivo conectado a la toma de corriente</string>
     <string name="instant_upload_on_charging">Cargar archivos sólo con el dispositivo conectado a la toma de corriente</string>
     <string name="instant_upload_path">/SubidasInstantáneas</string>

src/main/res/values-es-rMX/strings.xml

@@ -331,7 +331,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Cargar sólo mediante Wi-Fi</string>
-    <string name="instant_video_upload_on_wifi">Cargar videos sólo a través de Wi-Fi</string>
     <string name="instant_video_upload_on_charging">Cargar archivos sólo con el dispositivo conectado a la toma de corriente</string>
     <string name="instant_upload_on_charging">Cargar archivos sólo con el dispositivo conectado a la toma de corriente</string>
     <string name="instant_upload_path">/Cargas Automáticas</string>

src/main/res/values-es/strings.xml

@@ -331,7 +331,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Subir solamente por Wi-Fi</string>
-    <string name="instant_video_upload_on_wifi">Subir vídeos solamente por Wi-Fi</string>
     <string name="instant_video_upload_on_charging">Subir solamente al cargar</string>
     <string name="instant_upload_on_charging">Subir solamente al cargar</string>
     <string name="instant_upload_path">/SubidaInstantánea</string>

src/main/res/values-fi-rFI/strings.xml

@@ -277,7 +277,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Lähetä vain Wi-Fi-yhteydellä</string>
-    <string name="instant_video_upload_on_wifi">Lähetä videoita vain Wi-Fi-yhteydellä</string>
     <string name="instant_video_upload_on_charging">Lähetä vain ladattaessa virtaa</string>
     <string name="instant_upload_on_charging">Lähetä vain ladattaessa virtaa</string>
     <string name="instant_upload_path">/InstantUpload</string>

src/main/res/values-fr/strings.xml

@@ -331,7 +331,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Téléverser par wifi uniquement</string>
-    <string name="instant_video_upload_on_wifi">Téléverser les images via une connexion WiFi uniquement</string>
     <string name="instant_video_upload_on_charging">Téléverser les images uniquement si le chargeur est branché</string>
     <string name="instant_upload_on_charging">Téléverser les images uniquement si le chargeur est branché</string>
     <string name="instant_upload_path">/InstantUpload</string>

src/main/res/values-is/strings.xml

@@ -332,7 +332,6 @@ Smelltu hér til að fá þér einn frá þjónustuaðila.</string>
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Aðeins senda inn á þráðlausu WiFi-neti</string>
-    <string name="instant_video_upload_on_wifi">Aðeins senda inn myndskeið á þráðlausu WiFi-neti</string>
     <string name="instant_video_upload_on_charging">Einungis senda inn þegar verið er að hlaða</string>
     <string name="instant_upload_on_charging">Einungis senda inn þegar verið er að hlaða</string>
     <string name="instant_upload_path">/BeinInnsending</string>

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

@@ -331,7 +331,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Carica solo su Wi-Fi</string>
-    <string name="instant_video_upload_on_wifi">Carica video solo in Wi-Fi</string>
     <string name="instant_video_upload_on_charging">Carica solo durante la ricarica</string>
     <string name="instant_upload_on_charging">Carica solo durante la ricarica</string>
     <string name="instant_upload_path">/InstantUpload</string>

src/main/res/values-nb-rNO/strings.xml

@@ -331,7 +331,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Bare last opp på Wi-Fi</string>
-    <string name="instant_video_upload_on_wifi">Last kun opp filmer via Wi-Fi</string>
     <string name="instant_video_upload_on_charging">Last kun opp under lading</string>
     <string name="instant_upload_on_charging">Last kun opp under lading</string>
     <string name="instant_upload_path">/Direkteopplasting</string>

src/main/res/values-nl/strings.xml

@@ -332,7 +332,6 @@ Kies er eentje van een provider.</string>
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Alleen uploaden via Wi-Fi</string>
-    <string name="instant_video_upload_on_wifi">Alleen video\'s uploaden via Wi-Fi</string>
     <string name="instant_video_upload_on_charging">Alleen uploaden bij opladen</string>
     <string name="instant_upload_on_charging">Alleen uploaden bij opladen</string>
     <string name="instant_upload_path">/InstantUpload</string>

src/main/res/values-pl/strings.xml

@@ -330,7 +330,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Wysyłaj tylko przez Wi-Fi</string>
-    <string name="instant_video_upload_on_wifi">Wysyłaj pliki wideo tylko przez Wi-Fi</string>
     <string name="instant_video_upload_on_charging">Wysyłaj tylko podczas ładowania</string>
     <string name="instant_upload_on_charging">Wysyłaj tylko podczas ładowania</string>
     <string name="instant_upload_path">/InstantUpload</string>

src/main/res/values-pt-rBR/strings.xml

@@ -331,7 +331,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Somente enviar por Wi-Fi</string>
-    <string name="instant_video_upload_on_wifi">Somente enviar vídeos por Wi-Fi</string>
     <string name="instant_video_upload_on_charging">Somente enviar quando carregando</string>
     <string name="instant_upload_on_charging">Somente enviar quando carregando</string>
     <string name="instant_upload_path">/EnvioAutomático</string>

src/main/res/values-ru/strings.xml

@@ -333,7 +333,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Выгружать только через Wi-Fi</string>
-    <string name="instant_video_upload_on_wifi">Выгружать видео только через Wi-Fi</string>
     <string name="instant_video_upload_on_charging">Выгружать только при зарядке</string>
     <string name="instant_upload_on_charging">Выгружать только при зарядке</string>
     <string name="instant_upload_path">/Автозагрузка</string>

src/main/res/values-sl/strings.xml

@@ -315,7 +315,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Nalagaj samo na WiFi-ju</string>
-    <string name="instant_video_upload_on_wifi">Naloži samo posnetke na WiFi-ju</string>
     <string name="instant_video_upload_on_charging">Nalagaj samo med polnjenjem</string>
     <string name="instant_upload_on_charging">Nalagaj samo med polnjenjem</string>
     <string name="instant_upload_path">/Hipno nalaganje</string>

src/main/res/values-sq/strings.xml

@@ -331,7 +331,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Ngarko vetëm nëpërmjet WiFi</string>
-    <string name="instant_video_upload_on_wifi">Videot ngarkoji vetëm përmes wifi-it</string>
     <string name="instant_video_upload_on_charging">Ngarkoni vetëm kur jeni duke e karikuar</string>
     <string name="instant_upload_on_charging">Ngarkoni vetëm kur jeni duke e karikuar</string>
     <string name="instant_upload_path">/InstantUpload</string>

src/main/res/values-sv/strings.xml

@@ -331,7 +331,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Uppladdning bara via Wi-Fi</string>
-    <string name="instant_video_upload_on_wifi">Uppladdning av videor bara via Wi-Fi</string>
     <string name="instant_video_upload_on_charging">Uppladdning bara vid laddning</string>
     <string name="instant_upload_on_charging">Uppladdning bara vid ladddning</string>
     <string name="instant_upload_path">/AutomatiskUppladdning</string>

src/main/res/values-tr/strings.xml

@@ -331,7 +331,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Yalnız kablosuz ağ üzerinden yüklensin</string>
-    <string name="instant_video_upload_on_wifi">Görüntüler yalnız kablosuz ağ üzerinden yüklensin</string>
     <string name="instant_video_upload_on_charging">Yalnız şarj edilirken yüklensin</string>
     <string name="instant_upload_on_charging">Yalnız şarj edilirken yüklensin</string>
     <string name="instant_upload_path">/AnındaYükle</string>

src/main/res/values-zh-rCN/strings.xml

@@ -332,7 +332,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">仅在Wi-Fi下上传</string>
-    <string name="instant_video_upload_on_wifi">仅在Wi-Fi下上传视频</string>
     <string name="instant_video_upload_on_charging">仅在充电时上传</string>
     <string name="instant_upload_on_charging">仅在充电时上传</string>
     <string name="instant_upload_path">/实时上传</string>

src/main/res/values-zh-rTW/strings.xml

@@ -318,7 +318,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">只透過 WiFi 上傳</string>
-    <string name="instant_video_upload_on_wifi">只透過 WiFi 上傳影片</string>
     <string name="instant_video_upload_on_charging">只在充電時上傳</string>
     <string name="instant_upload_on_charging">只在充電時上傳</string>
     <string name="instant_upload_path">/InstantUpload</string>

src/main/res/values/strings.xml

@@ -332,7 +332,6 @@
     <string name="placeholder_media_time">12:23:45</string>
 
     <string name="auto_upload_on_wifi">Only upload on Wi-Fi</string>
-    <string name="instant_video_upload_on_wifi">Only upload videos on Wi-Fi</string>
     <string name="instant_video_upload_on_charging">Only upload when charging</string>
     <string name="instant_upload_on_charging">Only upload when charging</string>
     <string name="instant_upload_path">/InstantUpload</string>