diff --git a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadActivity.java b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadActivity.java index 5809a6ec9c..3a088b530c 100644 --- a/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadActivity.java +++ b/demos/main/src/main/java/com/google/android/exoplayer2/demo/DownloadActivity.java @@ -40,6 +40,7 @@ import com.google.android.exoplayer2.source.dash.manifest.RepresentationKey; import com.google.android.exoplayer2.source.dash.offline.DashDownloadAction; import com.google.android.exoplayer2.source.hls.offline.HlsDownloadAction; import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist; +import com.google.android.exoplayer2.source.hls.playlist.HlsMasterPlaylist.HlsUrl; import com.google.android.exoplayer2.source.hls.playlist.HlsMediaPlaylist; import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylist; import com.google.android.exoplayer2.source.hls.playlist.HlsPlaylistParser; @@ -326,17 +327,20 @@ public class DownloadActivity extends Activity { items.add(new RepresentationItem(null, "Stream")); } else { HlsMasterPlaylist masterPlaylist = (HlsMasterPlaylist) playlist; - ArrayList hlsUrls = new ArrayList<>(); - hlsUrls.addAll(masterPlaylist.variants); - hlsUrls.addAll(masterPlaylist.audios); - hlsUrls.addAll(masterPlaylist.subtitles); - for (HlsMasterPlaylist.HlsUrl hlsUrl : hlsUrls) { - items.add(new RepresentationItem(new RenditionKey(hlsUrl.url), hlsUrl.url)); - } + addRepresentationItems(masterPlaylist.variants, RenditionKey.GROUP_VARIANTS, items); + addRepresentationItems(masterPlaylist.audios, RenditionKey.GROUP_AUDIOS, items); + addRepresentationItems(masterPlaylist.subtitles, RenditionKey.GROUP_SUBTITLES, items); } return items; } + private void addRepresentationItems( + List renditions, int renditionGroup, List out) { + for (int i = 0; i < renditions.size(); i++) { + out.add(new RepresentationItem(new RenditionKey(renditionGroup, i), renditions.get(i).url)); + } + } + @Override public DownloadAction getDownloadAction( boolean isRemoveAction, String sampleName, List representationKeys) { diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadAction.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadAction.java index c6f6f8dadf..c4578853f5 100644 --- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadAction.java +++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadAction.java @@ -36,7 +36,9 @@ public final class HlsDownloadAction extends SegmentDownloadAction @Override protected RenditionKey readKey(DataInputStream input) throws IOException { - return new RenditionKey(input.readUTF()); + int renditionGroup = input.readInt(); + int trackIndex = input.readInt(); + return new RenditionKey(renditionGroup, trackIndex); } @Override @@ -67,7 +69,8 @@ public final class HlsDownloadAction extends SegmentDownloadAction @Override protected void writeKey(DataOutputStream output, RenditionKey key) throws IOException { - output.writeUTF(key.url); + output.writeInt(key.renditionGroup); + output.writeInt(key.trackIndex); } } diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java index 699436d8d9..1feb9d43b3 100644 --- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java +++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/HlsMasterPlaylist.java @@ -119,9 +119,9 @@ public final class HlsMasterPlaylist extends HlsPlaylist { return new HlsMasterPlaylist( baseUri, tags, - copyRenditionsList(variants, renditionKeys), - copyRenditionsList(audios, renditionKeys), - copyRenditionsList(subtitles, renditionKeys), + copyRenditionsList(variants, RenditionKey.GROUP_VARIANTS, renditionKeys), + copyRenditionsList(audios, RenditionKey.GROUP_AUDIOS, renditionKeys), + copyRenditionsList(subtitles, RenditionKey.GROUP_SUBTITLES, renditionKeys), muxedAudioFormat, muxedCaptionFormats); } @@ -140,13 +140,13 @@ public final class HlsMasterPlaylist extends HlsPlaylist { } private static List copyRenditionsList( - List renditions, List renditionKeys) { + List renditions, int renditionGroup, List renditionKeys) { List copiedRenditions = new ArrayList<>(renditionKeys.size()); for (int i = 0; i < renditions.size(); i++) { HlsUrl rendition = renditions.get(i); for (int j = 0; j < renditionKeys.size(); j++) { RenditionKey renditionKey = renditionKeys.get(j); - if (renditionKey.url.equals(rendition.url)) { + if (renditionKey.renditionGroup == renditionGroup && renditionKey.trackIndex == i) { copiedRenditions.add(rendition); break; } diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/RenditionKey.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/RenditionKey.java index 34e627904d..068686a2b2 100644 --- a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/RenditionKey.java +++ b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/playlist/RenditionKey.java @@ -22,10 +22,16 @@ import android.support.annotation.NonNull; /** Uniquely identifies a rendition in an {@link HlsMasterPlaylist}. */ public final class RenditionKey implements Parcelable, Comparable { - public final String url; + public static final int GROUP_VARIANTS = 0; + public static final int GROUP_AUDIOS = 1; + public static final int GROUP_SUBTITLES = 2; - public RenditionKey(String url) { - this.url = url; + public final int renditionGroup; + public final int trackIndex; + + public RenditionKey(int renditionGroup, int trackIndex) { + this.renditionGroup = renditionGroup; + this.trackIndex = trackIndex; } // Parcelable implementation. @@ -37,14 +43,15 @@ public final class RenditionKey implements Parcelable, Comparable @Override public void writeToParcel(Parcel dest, int flags) { - dest.writeString(url); + dest.writeInt(renditionGroup); + dest.writeInt(trackIndex); } public static final Creator CREATOR = new Creator() { @Override public RenditionKey createFromParcel(Parcel in) { - return new RenditionKey(in.readString()); + return new RenditionKey(in.readInt(), in.readInt()); } @Override @@ -56,7 +63,11 @@ public final class RenditionKey implements Parcelable, Comparable // Comparable implementation. @Override - public int compareTo(@NonNull RenditionKey o) { - return url.compareTo(o.url); + public int compareTo(@NonNull RenditionKey other) { + int result = renditionGroup - other.renditionGroup; + if (result == 0) { + result = trackIndex - other.trackIndex; + } + return result; } } diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadTestData.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadTestData.java index 55db28a59a..f38a4577be 100644 --- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadTestData.java +++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloadTestData.java @@ -22,6 +22,10 @@ import java.nio.charset.Charset; /* package */ interface HlsDownloadTestData { String MASTER_PLAYLIST_URI = "test.m3u8"; + int MASTER_MEDIA_PLAYLIST_1_INDEX = 0; + int MASTER_MEDIA_PLAYLIST_2_INDEX = 1; + int MASTER_MEDIA_PLAYLIST_3_INDEX = 2; + int MASTER_MEDIA_PLAYLIST_0_INDEX = 3; String MEDIA_PLAYLIST_0_DIR = "gear0/"; String MEDIA_PLAYLIST_0_URI = MEDIA_PLAYLIST_0_DIR + "prog_index.m3u8"; diff --git a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java index f9fe859eda..8af5119776 100644 --- a/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java +++ b/library/hls/src/test/java/com/google/android/exoplayer2/source/hls/offline/HlsDownloaderTest.java @@ -17,6 +17,8 @@ package com.google.android.exoplayer2.source.hls.offline; import static com.google.android.exoplayer2.source.hls.offline.HlsDownloadTestData.ENC_MEDIA_PLAYLIST_DATA; import static com.google.android.exoplayer2.source.hls.offline.HlsDownloadTestData.ENC_MEDIA_PLAYLIST_URI; +import static com.google.android.exoplayer2.source.hls.offline.HlsDownloadTestData.MASTER_MEDIA_PLAYLIST_1_INDEX; +import static com.google.android.exoplayer2.source.hls.offline.HlsDownloadTestData.MASTER_MEDIA_PLAYLIST_2_INDEX; import static com.google.android.exoplayer2.source.hls.offline.HlsDownloadTestData.MASTER_PLAYLIST_DATA; import static com.google.android.exoplayer2.source.hls.offline.HlsDownloadTestData.MASTER_PLAYLIST_URI; import static com.google.android.exoplayer2.source.hls.offline.HlsDownloadTestData.MEDIA_PLAYLIST_0_DIR; @@ -82,7 +84,8 @@ public class HlsDownloaderTest { @Test public void testCounterMethods() throws Exception { - HlsDownloader downloader = getHlsDownloader(MASTER_PLAYLIST_URI, getKeys(MEDIA_PLAYLIST_1_URI)); + HlsDownloader downloader = + getHlsDownloader(MASTER_PLAYLIST_URI, getKeys(MASTER_MEDIA_PLAYLIST_1_INDEX)); downloader.download(); assertThat(downloader.getDownloadedBytes()) @@ -91,7 +94,8 @@ public class HlsDownloaderTest { @Test public void testDownloadRepresentation() throws Exception { - HlsDownloader downloader = getHlsDownloader(MASTER_PLAYLIST_URI, getKeys(MEDIA_PLAYLIST_1_URI)); + HlsDownloader downloader = + getHlsDownloader(MASTER_PLAYLIST_URI, getKeys(MASTER_MEDIA_PLAYLIST_1_INDEX)); downloader.download(); assertCachedData( @@ -107,7 +111,9 @@ public class HlsDownloaderTest { @Test public void testDownloadMultipleRepresentations() throws Exception { HlsDownloader downloader = - getHlsDownloader(MASTER_PLAYLIST_URI, getKeys(MEDIA_PLAYLIST_1_URI, MEDIA_PLAYLIST_2_URI)); + getHlsDownloader( + MASTER_PLAYLIST_URI, + getKeys(MASTER_MEDIA_PLAYLIST_1_INDEX, MASTER_MEDIA_PLAYLIST_2_INDEX)); downloader.download(); assertCachedData(cache, fakeDataSet); @@ -135,7 +141,9 @@ public class HlsDownloaderTest { @Test public void testRemove() throws Exception { HlsDownloader downloader = - getHlsDownloader(MASTER_PLAYLIST_URI, getKeys(MEDIA_PLAYLIST_1_URI, MEDIA_PLAYLIST_2_URI)); + getHlsDownloader( + MASTER_PLAYLIST_URI, + getKeys(MASTER_MEDIA_PLAYLIST_1_INDEX, MASTER_MEDIA_PLAYLIST_2_INDEX)); downloader.download(); downloader.remove(); @@ -144,8 +152,7 @@ public class HlsDownloaderTest { @Test public void testDownloadMediaPlaylist() throws Exception { - HlsDownloader downloader = - getHlsDownloader(MEDIA_PLAYLIST_1_URI, getKeys(MEDIA_PLAYLIST_1_URI)); + HlsDownloader downloader = getHlsDownloader(MEDIA_PLAYLIST_1_URI); downloader.download(); assertCachedData( @@ -168,22 +175,21 @@ public class HlsDownloaderTest { .setRandomData("fileSequence1.ts", 11) .setRandomData("fileSequence2.ts", 12); - HlsDownloader downloader = - getHlsDownloader(ENC_MEDIA_PLAYLIST_URI, getKeys(ENC_MEDIA_PLAYLIST_URI)); + HlsDownloader downloader = getHlsDownloader(ENC_MEDIA_PLAYLIST_URI); downloader.download(); assertCachedData(cache, fakeDataSet); } - private HlsDownloader getHlsDownloader(String mediaPlaylistUri, @Nullable RenditionKey[] keys) { + private HlsDownloader getHlsDownloader(String mediaPlaylistUri, @Nullable RenditionKey... keys) { Factory factory = new Factory(null).setFakeDataSet(fakeDataSet); return new HlsDownloader( Uri.parse(mediaPlaylistUri), new DownloaderConstructorHelper(cache, factory), keys); } - private static RenditionKey[] getKeys(String... urls) { - RenditionKey[] renditionKeys = new RenditionKey[urls.length]; - for (int i = 0; i < urls.length; i++) { - renditionKeys[i] = new RenditionKey(urls[i]); + private static RenditionKey[] getKeys(int... variantIndices) { + RenditionKey[] renditionKeys = new RenditionKey[variantIndices.length]; + for (int i = 0; i < variantIndices.length; i++) { + renditionKeys[i] = new RenditionKey(RenditionKey.GROUP_VARIANTS, variantIndices[i]); } return renditionKeys; } diff --git a/library/ui/src/main/res/values-af/strings.xml b/library/ui/src/main/res/values-af/strings.xml index 9458bdecaf..4d525836a0 100644 --- a/library/ui/src/main/res/values-af/strings.xml +++ b/library/ui/src/main/res/values-af/strings.xml @@ -17,7 +17,7 @@ Laai tans af Aflaai is voltooi Kon nie aflaai nie - Removing downloads + Verwyder tans aflaaie Video Oudio SMS diff --git a/library/ui/src/main/res/values-am/strings.xml b/library/ui/src/main/res/values-am/strings.xml index 05a6c6e4df..08c7a3180a 100644 --- a/library/ui/src/main/res/values-am/strings.xml +++ b/library/ui/src/main/res/values-am/strings.xml @@ -17,7 +17,7 @@ በማውረድ ላይ ማውረድ ተጠናቋል ማውረድ አልተሳካም - Removing downloads + ውርዶችን በማስወገድ ላይ ቪዲዮ ኦዲዮ ጽሑፍ diff --git a/library/ui/src/main/res/values-az/strings.xml b/library/ui/src/main/res/values-az/strings.xml index 03d285dc29..4191095b4d 100644 --- a/library/ui/src/main/res/values-az/strings.xml +++ b/library/ui/src/main/res/values-az/strings.xml @@ -17,7 +17,7 @@ Endirilir Endirmə tamamlandı Endirmə alınmadı - Removing downloads + Endirilənlər silinir Video Audio Mətn diff --git a/library/ui/src/main/res/values-bg/strings.xml b/library/ui/src/main/res/values-bg/strings.xml index ca81e463d0..74bc85313d 100644 --- a/library/ui/src/main/res/values-bg/strings.xml +++ b/library/ui/src/main/res/values-bg/strings.xml @@ -17,7 +17,7 @@ Изтегля се Изтеглянето завърши Изтеглянето не бе успешно - Removing downloads + Изтеглянията се премахват Видеозапис Аудиозапис Текст diff --git a/library/ui/src/main/res/values-bn/strings.xml b/library/ui/src/main/res/values-bn/strings.xml index f6a30078a7..86d92c8ab6 100644 --- a/library/ui/src/main/res/values-bn/strings.xml +++ b/library/ui/src/main/res/values-bn/strings.xml @@ -23,13 +23,13 @@ টেক্সট কোনওটিই নয় অটো - Unknown + অজানা %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps + মোনো + স্টিরিও + সারাউন্ড সাউন্ড + 5.1 সারাউন্ড সাউন্ড + 7.1 সারাউন্ড সাউন্ড + %1$.2f এমবিপিএস %1$s, %2$s diff --git a/library/ui/src/main/res/values-bs/strings.xml b/library/ui/src/main/res/values-bs/strings.xml index 7a30edd5ae..be2f6459f5 100644 --- a/library/ui/src/main/res/values-bs/strings.xml +++ b/library/ui/src/main/res/values-bs/strings.xml @@ -17,7 +17,7 @@ Preuzimanje Preuzimanje je završeno Preuzimanje nije uspjelo - Removing downloads + Uklanjanje preuzimanja Videozapis Zvuk Tekst diff --git a/library/ui/src/main/res/values-cs/strings.xml b/library/ui/src/main/res/values-cs/strings.xml index 996c3677ab..c910fd3483 100644 --- a/library/ui/src/main/res/values-cs/strings.xml +++ b/library/ui/src/main/res/values-cs/strings.xml @@ -17,7 +17,7 @@ Stahování Stahování bylo dokončeno Stažení se nezdařilo - Removing downloads + Odstraňování staženého obsahu Videa Zvuk SMS diff --git a/library/ui/src/main/res/values-de/strings.xml b/library/ui/src/main/res/values-de/strings.xml index abcad84a5d..3e83396678 100644 --- a/library/ui/src/main/res/values-de/strings.xml +++ b/library/ui/src/main/res/values-de/strings.xml @@ -17,7 +17,7 @@ Wird heruntergeladen Download abgeschlossen Download fehlgeschlagen - Removing downloads + Downloads werden entfernt Video Audio Text diff --git a/library/ui/src/main/res/values-es/strings.xml b/library/ui/src/main/res/values-es/strings.xml index 98621eaf67..7a48245abb 100644 --- a/library/ui/src/main/res/values-es/strings.xml +++ b/library/ui/src/main/res/values-es/strings.xml @@ -17,7 +17,7 @@ Descargando Descarga de archivos completado No se ha podido descargar - Removing downloads + Quitando descargas Vídeo Audio Texto diff --git a/library/ui/src/main/res/values-eu/strings.xml b/library/ui/src/main/res/values-eu/strings.xml index 1dcde5e6cb..31ec286cfb 100644 --- a/library/ui/src/main/res/values-eu/strings.xml +++ b/library/ui/src/main/res/values-eu/strings.xml @@ -17,7 +17,7 @@ Deskargatzen Osatu da deskarga Ezin izan da deskargatu - Removing downloads + Deskargak kentzen Bideoa Audioa Testua diff --git a/library/ui/src/main/res/values-fa/strings.xml b/library/ui/src/main/res/values-fa/strings.xml index 9362fb0460..9b0853cee5 100644 --- a/library/ui/src/main/res/values-fa/strings.xml +++ b/library/ui/src/main/res/values-fa/strings.xml @@ -17,7 +17,7 @@ درحال بارگیری بارگیری کامل شد بارگیری نشد - Removing downloads + حذف بارگیری‌ها ویدیو صوتی نوشتار diff --git a/library/ui/src/main/res/values-fr-rCA/strings.xml b/library/ui/src/main/res/values-fr-rCA/strings.xml index c79d533207..b68fab04ed 100644 --- a/library/ui/src/main/res/values-fr-rCA/strings.xml +++ b/library/ui/src/main/res/values-fr-rCA/strings.xml @@ -17,7 +17,7 @@ Téléchargement en cours… Téléchargement terminé Échec du téléchargement - Removing downloads + Suppression des téléchargements en cours… Vidéo Audio Texte diff --git a/library/ui/src/main/res/values-gu/strings.xml b/library/ui/src/main/res/values-gu/strings.xml index aa4b5be8e7..4a1c8a466d 100644 --- a/library/ui/src/main/res/values-gu/strings.xml +++ b/library/ui/src/main/res/values-gu/strings.xml @@ -23,13 +23,13 @@ ટેક્સ્ટ એકપણ નહીં આપમેળે - Unknown + અજાણ્યો %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound + મૉનો + સ્ટીરિઓ + સરાઉન્ડ સાઉન્ડ + 5.1 સરાઉન્ડ સાઉન્ડ + 7.1 સરાઉન્ડ સાઉન્ડ %1$.2f Mbps %1$s, %2$s diff --git a/library/ui/src/main/res/values-hy/strings.xml b/library/ui/src/main/res/values-hy/strings.xml index e493228397..38468b892d 100644 --- a/library/ui/src/main/res/values-hy/strings.xml +++ b/library/ui/src/main/res/values-hy/strings.xml @@ -17,7 +17,7 @@ Ներբեռնում Ներբեռնումն ավարտվեց Չհաջողվեց ներբեռնել - Removing downloads + Ներբեռնումները հեռացվում են Տեսանյութ Աուդիո Տեքստ diff --git a/library/ui/src/main/res/values-in/strings.xml b/library/ui/src/main/res/values-in/strings.xml index 06ad40a0e9..6cbd6a703a 100644 --- a/library/ui/src/main/res/values-in/strings.xml +++ b/library/ui/src/main/res/values-in/strings.xml @@ -17,7 +17,7 @@ Mendownload Download selesai Download gagal - Removing downloads + Menghapus download Video Audio Teks diff --git a/library/ui/src/main/res/values-ja/strings.xml b/library/ui/src/main/res/values-ja/strings.xml index 0aa351cf68..86f204e572 100644 --- a/library/ui/src/main/res/values-ja/strings.xml +++ b/library/ui/src/main/res/values-ja/strings.xml @@ -17,7 +17,7 @@ ダウンロードしています ダウンロードが完了しました ダウンロードに失敗しました - Removing downloads + ダウンロードを削除しています 動画 音声 SMS diff --git a/library/ui/src/main/res/values-ka/strings.xml b/library/ui/src/main/res/values-ka/strings.xml index 5653b57012..5b8c08065e 100644 --- a/library/ui/src/main/res/values-ka/strings.xml +++ b/library/ui/src/main/res/values-ka/strings.xml @@ -17,7 +17,7 @@ მიმდინარეობს ჩამოტვირთვა ჩამოტვირთვა დასრულდა ჩამოტვირთვა ვერ მოხერხდა - Removing downloads + მიმდინარეობს ჩამოტვირთვების ამოშლა ვიდეო აუდიო SMS diff --git a/library/ui/src/main/res/values-km/strings.xml b/library/ui/src/main/res/values-km/strings.xml index c24f9e5a84..89d73605a5 100644 --- a/library/ui/src/main/res/values-km/strings.xml +++ b/library/ui/src/main/res/values-km/strings.xml @@ -17,7 +17,7 @@ កំពុង​ទាញ​យក បាន​បញ្ចប់​ការទាញយក មិន​អាច​ទាញយក​បាន​ទេ - Removing downloads + កំពុង​លុប​ការទាញយក វីដេអូ សំឡេង អក្សរ diff --git a/library/ui/src/main/res/values-kn/strings.xml b/library/ui/src/main/res/values-kn/strings.xml index 57fe1710d4..cc60177d94 100644 --- a/library/ui/src/main/res/values-kn/strings.xml +++ b/library/ui/src/main/res/values-kn/strings.xml @@ -23,13 +23,13 @@ ಪಠ್ಯ ಯಾವುದೂ ಅಲ್ಲ ಸ್ವಯಂ - Unknown + ಅಪರಿಚಿತ %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound + ಮೊನೊ + ಸ್ಟೀರಿಯೊ + ಸರೌಂಡ್ ಶಬ್ದ + 5.1 ಸರೌಂಡ್ ಶಬ್ದ + 7.1 ಸರೌಂಡ್ ಶಬ್ದ %1$.2f Mbps %1$s, %2$s diff --git a/library/ui/src/main/res/values-ky/strings.xml b/library/ui/src/main/res/values-ky/strings.xml index 1a1cce14cd..20a4739a2b 100644 --- a/library/ui/src/main/res/values-ky/strings.xml +++ b/library/ui/src/main/res/values-ky/strings.xml @@ -17,7 +17,7 @@ Жүктөлүп алынууда Жүктөп алуу аяктады Жүктөлүп алынбай калды - Removing downloads + Жүктөлүп алынгандар өчүрүлүүдө Видео Аудио Текст diff --git a/library/ui/src/main/res/values-lo/strings.xml b/library/ui/src/main/res/values-lo/strings.xml index f730002156..3de5962a42 100644 --- a/library/ui/src/main/res/values-lo/strings.xml +++ b/library/ui/src/main/res/values-lo/strings.xml @@ -17,7 +17,7 @@ ກຳລັງດາວໂຫລດ ດາວໂຫລດສຳເລັດແລ້ວ ດາວໂຫຼດບໍ່ສຳເລັດ - Removing downloads + ກຳລັງລຶບການດາວໂຫລດອອກ ວິດີໂອ ສຽງ ຂໍ້ຄວາມ diff --git a/library/ui/src/main/res/values-lt/strings.xml b/library/ui/src/main/res/values-lt/strings.xml index 7c04e42ca2..eaf26aafb6 100644 --- a/library/ui/src/main/res/values-lt/strings.xml +++ b/library/ui/src/main/res/values-lt/strings.xml @@ -17,7 +17,7 @@ Atsisiunčiama Atsisiuntimo procesas baigtas Nepavyko atsisiųsti - Removing downloads + Pašalinami atsisiuntimai Vaizdo įrašas Garso įrašas Tekstas diff --git a/library/ui/src/main/res/values-mk/strings.xml b/library/ui/src/main/res/values-mk/strings.xml index da6572d96a..3e6ae777cc 100644 --- a/library/ui/src/main/res/values-mk/strings.xml +++ b/library/ui/src/main/res/values-mk/strings.xml @@ -17,7 +17,7 @@ Се презема Преземањето заврши Неуспешно преземање - Removing downloads + Се отстрануваат преземањата Видео Аудио Текст diff --git a/library/ui/src/main/res/values-ml/strings.xml b/library/ui/src/main/res/values-ml/strings.xml index 3809d4368e..f2c8be43d3 100644 --- a/library/ui/src/main/res/values-ml/strings.xml +++ b/library/ui/src/main/res/values-ml/strings.xml @@ -23,13 +23,13 @@ ടെക്‌സ്റ്റ് ഒന്നുമില്ല സ്വമേധയാ - Unknown + അജ്ഞാതം %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound + മോണോ + സ്റ്റീരിയോ + സറൗണ്ട് സൗണ്ട് + 5.1 സറൗണ്ട് സൗണ്ട് + 7.1 സറൗണ്ട് സൗണ്ട് %1$.2f Mbps %1$s, %2$s diff --git a/library/ui/src/main/res/values-mn/strings.xml b/library/ui/src/main/res/values-mn/strings.xml index 99ece36c09..328827f87f 100644 --- a/library/ui/src/main/res/values-mn/strings.xml +++ b/library/ui/src/main/res/values-mn/strings.xml @@ -17,7 +17,7 @@ Татаж байна Татаж дууссан Татаж чадсангүй - Removing downloads + Татаж авсан файлыг хасаж байна Видео Дуу Текст diff --git a/library/ui/src/main/res/values-mr/strings.xml b/library/ui/src/main/res/values-mr/strings.xml index 5d30a05d64..9f73557615 100644 --- a/library/ui/src/main/res/values-mr/strings.xml +++ b/library/ui/src/main/res/values-mr/strings.xml @@ -23,13 +23,13 @@ मजकूर काहीही नाही आपोआप - Unknown + अज्ञात %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound + मोनो + स्टिरिओ + सराउंड साउंड + ५.१ सराउंड साउंड + ७.१ सराउंड साउंड %1$.2f Mbps %1$s, %2$s diff --git a/library/ui/src/main/res/values-ms/strings.xml b/library/ui/src/main/res/values-ms/strings.xml index e8556813b8..c4a437da3b 100644 --- a/library/ui/src/main/res/values-ms/strings.xml +++ b/library/ui/src/main/res/values-ms/strings.xml @@ -17,7 +17,7 @@ Memuat turun Muat turun selesai Muat turun gagal - Removing downloads + Mengalih keluar muat turun Video Audio Teks diff --git a/library/ui/src/main/res/values-my/strings.xml b/library/ui/src/main/res/values-my/strings.xml index 5ab03a1b38..497ff50416 100644 --- a/library/ui/src/main/res/values-my/strings.xml +++ b/library/ui/src/main/res/values-my/strings.xml @@ -17,7 +17,7 @@ ဒေါင်းလုဒ်လုပ်နေသည် ဒေါင်းလုဒ်လုပ်ပြီးပါပြီ ဒေါင်းလုဒ်လုပ်၍ မရပါ - Removing downloads + ဒေါင်းလုဒ်များ ဖယ်ရှားနေသည် ဗီဒီယို အသံ စာသား diff --git a/library/ui/src/main/res/values-ne/strings.xml b/library/ui/src/main/res/values-ne/strings.xml index 426c682efe..86a4698326 100644 --- a/library/ui/src/main/res/values-ne/strings.xml +++ b/library/ui/src/main/res/values-ne/strings.xml @@ -23,13 +23,13 @@ पाठ कुनै पनि होइन स्वतः - Unknown + अज्ञात %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound + मोनो + स्टेरियो + सराउन्ड साउन्ड + 5.1 सराउन्ड साउन्ड + 7.1 सराउन्ड साउन्ड %1$.2f Mbps %1$s, %2$s diff --git a/library/ui/src/main/res/values-pa/strings.xml b/library/ui/src/main/res/values-pa/strings.xml index 072a98f9ad..86934d4362 100644 --- a/library/ui/src/main/res/values-pa/strings.xml +++ b/library/ui/src/main/res/values-pa/strings.xml @@ -23,13 +23,13 @@ ਲਿਖਤ ਕੋਈ ਨਹੀਂ ਸਵੈਚਲਿਤ - Unknown + ਅਗਿਆਤ %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound + ਮੋਨੋ + ਸਟੀਰਿਓ + ਸਰਾਊਂਡ ਸਾਊਂਡ + 5.1 ਸਰਾਊਂਡ ਸਾਊਂਡ + 7.1 ਸਰਾਊਂਡ ਸਾਊਂਡ %1$.2f Mbps %1$s, %2$s diff --git a/library/ui/src/main/res/values-pl/strings.xml b/library/ui/src/main/res/values-pl/strings.xml index 266e224de2..22021ec1ed 100644 --- a/library/ui/src/main/res/values-pl/strings.xml +++ b/library/ui/src/main/res/values-pl/strings.xml @@ -23,13 +23,13 @@ Tekst Brak Automatycznie - Unknown - %1$d × %2$d + Nieznany + %1$d × %2$d Mono Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound - %1$.2f Mbps + Dźwięk przestrzenny + System dźwięku przestrzennego 5.1 + System dźwięku przestrzennego 7.1 + %1$.2f Mb/s %1$s, %2$s diff --git a/library/ui/src/main/res/values-pt-rPT/strings.xml b/library/ui/src/main/res/values-pt-rPT/strings.xml index c39b4d180d..52eb01e219 100644 --- a/library/ui/src/main/res/values-pt-rPT/strings.xml +++ b/library/ui/src/main/res/values-pt-rPT/strings.xml @@ -17,7 +17,7 @@ A transferir… Transferência concluída Falha na transferência - Removing downloads + A remover as transferências… Vídeo Áudio Texto diff --git a/library/ui/src/main/res/values-pt/strings.xml b/library/ui/src/main/res/values-pt/strings.xml index 77a918782f..6ea00fed8d 100644 --- a/library/ui/src/main/res/values-pt/strings.xml +++ b/library/ui/src/main/res/values-pt/strings.xml @@ -17,7 +17,7 @@ Fazendo o download Download concluído Falha no download - Removing downloads + Removendo downloads Vídeo Áudio Texto diff --git a/library/ui/src/main/res/values-si/strings.xml b/library/ui/src/main/res/values-si/strings.xml index 7c18d541ed..92ae038c4b 100644 --- a/library/ui/src/main/res/values-si/strings.xml +++ b/library/ui/src/main/res/values-si/strings.xml @@ -17,7 +17,7 @@ බාගනිමින් බාගැනීම සම්පූර්ණ කරන ලදී බාගැනීම අසමත් විය - Removing downloads + බාගැනීම් ඉවත් කිරීම වීඩියෝ ශ්‍රව්‍ය පෙළ diff --git a/library/ui/src/main/res/values-sl/strings.xml b/library/ui/src/main/res/values-sl/strings.xml index d34d8734a7..83d332103e 100644 --- a/library/ui/src/main/res/values-sl/strings.xml +++ b/library/ui/src/main/res/values-sl/strings.xml @@ -17,7 +17,7 @@ Prenašanje Prenos je končan Prenos ni uspel - Removing downloads + Odstranjevanje prenosov Videoposnetki Zvočni posnetki Podnapisi diff --git a/library/ui/src/main/res/values-sq/strings.xml b/library/ui/src/main/res/values-sq/strings.xml index d04905c512..c46524762d 100644 --- a/library/ui/src/main/res/values-sq/strings.xml +++ b/library/ui/src/main/res/values-sq/strings.xml @@ -17,7 +17,7 @@ Po shkarkohet Shkarkimi përfundoi Shkarkimi dështoi - Removing downloads + Shkarkimet po hiqen Video Audio Tekst diff --git a/library/ui/src/main/res/values-sw/strings.xml b/library/ui/src/main/res/values-sw/strings.xml index e65aed6eba..2c7268626f 100644 --- a/library/ui/src/main/res/values-sw/strings.xml +++ b/library/ui/src/main/res/values-sw/strings.xml @@ -17,7 +17,7 @@ Inapakua Imepakuliwa Imeshindwa kupakua - Removing downloads + Inaondoa vipakuliwa Video Sauti SMS diff --git a/library/ui/src/main/res/values-te/strings.xml b/library/ui/src/main/res/values-te/strings.xml index 897dc4e24a..e66da79e0d 100644 --- a/library/ui/src/main/res/values-te/strings.xml +++ b/library/ui/src/main/res/values-te/strings.xml @@ -23,13 +23,13 @@ వచనం ఏదీ కాదు స్వీయ - Unknown + తెలియదు %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound + మోనో + స్టీరియో + సరౌండ్ ధ్వని + 5.1 సరౌండ్ ధ్వని + 7.1 సరౌండ్ ధ్వని %1$.2f Mbps %1$s, %2$s diff --git a/library/ui/src/main/res/values-th/strings.xml b/library/ui/src/main/res/values-th/strings.xml index 823af646fb..85c4f8cf92 100644 --- a/library/ui/src/main/res/values-th/strings.xml +++ b/library/ui/src/main/res/values-th/strings.xml @@ -17,7 +17,7 @@ กำลังดาวน์โหลด การดาวน์โหลดเสร็จสมบูรณ์ การดาวน์โหลดล้มเหลว - Removing downloads + กำลังนำรายการที่ดาวน์โหลดออก วิดีโอ เสียง ข้อความ diff --git a/library/ui/src/main/res/values-tl/strings.xml b/library/ui/src/main/res/values-tl/strings.xml index 00c77eb366..dfad2c1b08 100644 --- a/library/ui/src/main/res/values-tl/strings.xml +++ b/library/ui/src/main/res/values-tl/strings.xml @@ -17,7 +17,7 @@ Nagda-download Tapos na ang pag-download Hindi na-download - Removing downloads + Inaalis ang mga na-download Video Audio Text diff --git a/library/ui/src/main/res/values-ur/strings.xml b/library/ui/src/main/res/values-ur/strings.xml index 47c16a2bff..8b6cdadc59 100644 --- a/library/ui/src/main/res/values-ur/strings.xml +++ b/library/ui/src/main/res/values-ur/strings.xml @@ -23,13 +23,13 @@ متن کوئی نہیں خودکار - Unknown + نامعلوم %1$d × %2$d - Mono - Stereo - Surround sound - 5.1 surround sound - 7.1 surround sound + مونو + اسٹیریو + محیط آواز + 5.1 محیط آواز + 7.1 محیط آواز %1$.2f Mbps - %1$s, %2$s + %1$s، %2$s diff --git a/library/ui/src/main/res/values-uz/strings.xml b/library/ui/src/main/res/values-uz/strings.xml index 143ada1904..5c9a05d259 100644 --- a/library/ui/src/main/res/values-uz/strings.xml +++ b/library/ui/src/main/res/values-uz/strings.xml @@ -17,7 +17,7 @@ Yuklab olinmoqda Yuklab olindi Yuklab olinmadi - Removing downloads + Yuklanmalar olib tashlanmoqda Video Audio Matn diff --git a/library/ui/src/main/res/values-vi/strings.xml b/library/ui/src/main/res/values-vi/strings.xml index 9c1d430546..f56d5f5d90 100644 --- a/library/ui/src/main/res/values-vi/strings.xml +++ b/library/ui/src/main/res/values-vi/strings.xml @@ -17,7 +17,7 @@ Đang tải xuống Đã hoàn tất tải xuống Không tải xuống được - Removing downloads + Đang xóa các mục tải xuống Video Âm thanh Văn bản diff --git a/library/ui/src/main/res/values-zh-rCN/strings.xml b/library/ui/src/main/res/values-zh-rCN/strings.xml index 69f1306b88..e75697621c 100644 --- a/library/ui/src/main/res/values-zh-rCN/strings.xml +++ b/library/ui/src/main/res/values-zh-rCN/strings.xml @@ -17,7 +17,7 @@ 正在下载 下载完毕 下载失败 - Removing downloads + 正在移除下载内容 视频 音频 文字 diff --git a/library/ui/src/main/res/values-zu/strings.xml b/library/ui/src/main/res/values-zu/strings.xml index 1ce0cc29bc..0b78b7d1fa 100644 --- a/library/ui/src/main/res/values-zu/strings.xml +++ b/library/ui/src/main/res/values-zu/strings.xml @@ -17,7 +17,7 @@ Iyalanda Ukulanda kuqedile Ukulanda kuhlulekile - Removing downloads + Kususwa okulandiwe Ividiyo Umsindo Umbhalo