diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml new file mode 100644 index 00000000000..2c79d62cd39 --- /dev/null +++ b/.github/FUNDING.yml @@ -0,0 +1 @@ +liberapay: TeamNewPipe diff --git a/.gitignore b/.gitignore index b1746282e90..f4f47c5eeb0 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,6 @@ /app/app.iml /.idea /*.iml -gradle.properties *~ .weblate *.class diff --git a/app/build.gradle b/app/build.gradle index 820e0257002..13aae361908 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,10 +8,10 @@ android { applicationId "org.schabi.newpipe" minSdkVersion 19 targetSdkVersion 28 - versionCode 740 - versionName "0.16.2" + versionCode 780 + versionName "0.17.3" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true } @@ -43,38 +43,40 @@ android { } ext { - supportLibVersion = '28.0.0' - exoPlayerLibVersion = '2.9.6' - roomDbLibVersion = '1.1.1' + androidxLibVersion = '1.0.0' + exoPlayerLibVersion = '2.10.6' + roomDbLibVersion = '2.1.0' leakCanaryLibVersion = '1.5.4' //1.6.1 - okHttpLibVersion = '3.12.1' + okHttpLibVersion = '3.12.6' icepickLibVersion = '3.2.0' stethoLibVersion = '1.5.0' } dependencies { - androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.2', { + androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0', { exclude module: 'support-annotations' }) - implementation 'com.github.TeamNewPipe:NewPipeExtractor:c64c90a' - + implementation 'com.github.teamnewpipe:NewPipeExtractor:06f2144e4daa10' testImplementation 'junit:junit:4.12' testImplementation 'org.mockito:mockito-core:2.23.0' - implementation "com.android.support:appcompat-v7:${supportLibVersion}" - implementation "com.android.support:support-v4:${supportLibVersion}" - implementation "com.android.support:design:${supportLibVersion}" - implementation "com.android.support:recyclerview-v7:${supportLibVersion}" - implementation "com.android.support:preference-v14:${supportLibVersion}" - implementation "com.android.support:cardview-v7:${supportLibVersion}" - implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation "androidx.legacy:legacy-support-v4:${androidxLibVersion}" + implementation "com.google.android.material:material:${androidxLibVersion}" + implementation "androidx.recyclerview:recyclerview:${androidxLibVersion}" + implementation "androidx.legacy:legacy-preference-v14:${androidxLibVersion}" + implementation "androidx.cardview:cardview:${androidxLibVersion}" + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + + // Originally in NewPipeExtractor + implementation 'com.grack:nanojson:1.1' + implementation 'org.jsoup:jsoup:1.9.2' implementation 'ch.acra:acra:4.9.2' //4.11 implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5' implementation 'de.hdodenhof:circleimageview:2.2.0' - implementation 'com.github.nirhart:ParallaxScroll:dd53d1f9d1' implementation 'com.nononsenseapps:filepicker:4.2.1' implementation "com.google.android.exoplayer:exoplayer:${exoPlayerLibVersion}" @@ -82,15 +84,15 @@ dependencies { debugImplementation "com.facebook.stetho:stetho:${stethoLibVersion}" debugImplementation "com.facebook.stetho:stetho-urlconnection:${stethoLibVersion}" - debugImplementation 'com.android.support:multidex:1.0.3' + debugImplementation 'androidx.multidex:multidex:2.0.1' implementation 'io.reactivex.rxjava2:rxjava:2.2.2' implementation 'io.reactivex.rxjava2:rxandroid:2.1.0' implementation 'com.jakewharton.rxbinding2:rxbinding:2.1.1' - implementation "android.arch.persistence.room:runtime:${roomDbLibVersion}" - implementation "android.arch.persistence.room:rxjava2:${roomDbLibVersion}" - annotationProcessor "android.arch.persistence.room:compiler:${roomDbLibVersion}" + implementation "androidx.room:room-runtime:${roomDbLibVersion}" + implementation "androidx.room:room-rxjava2:${roomDbLibVersion}" + annotationProcessor "androidx.room:room-compiler:${roomDbLibVersion}" implementation "frankiesardo:icepick:${icepickLibVersion}" annotationProcessor "frankiesardo:icepick-processor:${icepickLibVersion}" diff --git a/app/src/androidTest/java/org/schabi/newpipe/report/ErrorInfoTest.java b/app/src/androidTest/java/org/schabi/newpipe/report/ErrorInfoTest.java index cdeb47483f2..6e51136c061 100644 --- a/app/src/androidTest/java/org/schabi/newpipe/report/ErrorInfoTest.java +++ b/app/src/androidTest/java/org/schabi/newpipe/report/ErrorInfoTest.java @@ -1,8 +1,8 @@ package org.schabi.newpipe.report; import android.os.Parcel; -import android.support.test.filters.LargeTest; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.filters.LargeTest; +import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/app/src/debug/java/org/schabi/newpipe/DebugApp.java b/app/src/debug/java/org/schabi/newpipe/DebugApp.java index aff354a6958..154fb5a8c50 100644 --- a/app/src/debug/java/org/schabi/newpipe/DebugApp.java +++ b/app/src/debug/java/org/schabi/newpipe/DebugApp.java @@ -3,8 +3,8 @@ import android.content.Context; import android.content.SharedPreferences; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.multidex.MultiDex; +import androidx.annotation.NonNull; +import androidx.multidex.MultiDex; import com.facebook.stetho.Stetho; import com.facebook.stetho.okhttp3.StethoInterceptor; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1d1a004dd36..f3ffb1e14c0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -30,7 +30,7 @@ - + @@ -116,7 +116,7 @@ android:label="@string/reCaptchaActivity"/> @@ -229,7 +229,20 @@ + + + + + + + + + + + + + diff --git a/app/src/main/java/android/support/design/widget/FlingBehavior.java b/app/src/main/java/android/support/design/widget/FlingBehavior.java deleted file mode 100644 index 59eb0829488..00000000000 --- a/app/src/main/java/android/support/design/widget/FlingBehavior.java +++ /dev/null @@ -1,116 +0,0 @@ -package android.support.design.widget; - -import android.animation.ValueAnimator; -import android.content.Context; -import android.support.annotation.NonNull; -import android.support.design.animation.AnimationUtils; -import android.util.AttributeSet; -import android.view.View; - -// check this https://github.com/ToDou/appbarlayout-spring-behavior/blob/master/appbarspring/src/main/java/android/support/design/widget/AppBarFlingFixBehavior.java -public final class FlingBehavior extends AppBarLayout.Behavior { - - private ValueAnimator mOffsetAnimator; - private static final int MAX_OFFSET_ANIMATION_DURATION = 600; // ms - - public FlingBehavior() { - } - - public FlingBehavior(Context context, AttributeSet attrs) { - super(context, attrs); - } - - @Override - public void onNestedPreScroll(CoordinatorLayout coordinatorLayout, AppBarLayout child, View target, int dx, int dy, int[] consumed, int type) { - if (dy != 0) { - int val = child.getBottom(); - if (val != 0) { - int min, max; - if (dy < 0) { - // We're scrolling down - } else { - // We're scrolling up - if (mOffsetAnimator != null && mOffsetAnimator.isRunning()) { - mOffsetAnimator.cancel(); - } - min = -child.getUpNestedPreScrollRange(); - max = 0; - consumed[1] = scroll(coordinatorLayout, child, dy, min, max); - } - } - } - } - - @Override - public boolean onNestedPreFling(@NonNull CoordinatorLayout coordinatorLayout, @NonNull AppBarLayout child, @NonNull View target, float velocityX, float velocityY) { - - if (velocityY != 0) { - if (velocityY < 0) { - // We're flinging down - int val = child.getBottom(); - if (val != 0) { - final int targetScroll = - +child.getDownNestedPreScrollRange(); - animateOffsetTo(coordinatorLayout, child, targetScroll, velocityY); - } - - } else { - // We're flinging up - int val = child.getBottom(); - if (val != 0) { - final int targetScroll = -child.getUpNestedPreScrollRange(); - if (getTopBottomOffsetForScrollingSibling() > targetScroll) { - animateOffsetTo(coordinatorLayout, child, targetScroll, velocityY); - } - } - } - } - - return super.onNestedPreFling(coordinatorLayout, child, target, velocityX, velocityY); - } - - private void animateOffsetTo(final CoordinatorLayout coordinatorLayout, - final AppBarLayout child, final int offset, float velocity) { - final int distance = Math.abs(getTopBottomOffsetForScrollingSibling() - offset); - - final int duration; - velocity = Math.abs(velocity); - if (velocity > 0) { - duration = 3 * Math.round(1000 * (distance / velocity)); - } else { - final float distanceRatio = (float) distance / child.getHeight(); - duration = (int) ((distanceRatio + 1) * 150); - } - - animateOffsetWithDuration(coordinatorLayout, child, offset, duration); - } - - private void animateOffsetWithDuration(final CoordinatorLayout coordinatorLayout, - final AppBarLayout child, final int offset, final int duration) { - final int currentOffset = getTopBottomOffsetForScrollingSibling(); - if (currentOffset == offset) { - if (mOffsetAnimator != null && mOffsetAnimator.isRunning()) { - mOffsetAnimator.cancel(); - } - return; - } - - if (mOffsetAnimator == null) { - mOffsetAnimator = new ValueAnimator(); - mOffsetAnimator.setInterpolator(AnimationUtils.DECELERATE_INTERPOLATOR); - mOffsetAnimator.addUpdateListener(new ValueAnimator.AnimatorUpdateListener() { - @Override - public void onAnimationUpdate(ValueAnimator animator) { - setHeaderTopBottomOffset(coordinatorLayout, child, - (Integer) animator.getAnimatedValue()); - } - }); - } else { - mOffsetAnimator.cancel(); - } - - mOffsetAnimator.setDuration(Math.min(duration, MAX_OFFSET_ANIMATION_DURATION)); - mOffsetAnimator.setIntValues(currentOffset, offset); - mOffsetAnimator.start(); - } -} \ No newline at end of file diff --git a/app/src/main/java/com/google/android/material/appbar/FlingBehavior.java b/app/src/main/java/com/google/android/material/appbar/FlingBehavior.java new file mode 100644 index 00000000000..4a2662f5384 --- /dev/null +++ b/app/src/main/java/com/google/android/material/appbar/FlingBehavior.java @@ -0,0 +1,82 @@ +package com.google.android.material.appbar; + +import android.content.Context; +import android.util.AttributeSet; +import android.view.MotionEvent; +import android.widget.OverScroller; + +import androidx.annotation.Nullable; +import androidx.coordinatorlayout.widget.CoordinatorLayout; + +import java.lang.reflect.Field; + +// check this https://stackoverflow.com/questions/56849221/recyclerview-fling-causes-laggy-while-appbarlayout-is-scrolling/57997489#57997489 +public final class FlingBehavior extends AppBarLayout.Behavior { + + public FlingBehavior(Context context, AttributeSet attrs) { + super(context, attrs); + } + + @Override + public boolean onInterceptTouchEvent(CoordinatorLayout parent, AppBarLayout child, MotionEvent ev) { + switch (ev.getActionMasked()) { + case MotionEvent.ACTION_DOWN: + // remove reference to old nested scrolling child + resetNestedScrollingChild(); + // Stop fling when your finger touches the screen + stopAppBarLayoutFling(); + break; + default: + break; + } + return super.onInterceptTouchEvent(parent, child, ev); + } + + @Nullable + private OverScroller getScrollerField() { + try { + Class headerBehaviorType = this.getClass().getSuperclass().getSuperclass().getSuperclass(); + if (headerBehaviorType != null) { + Field field = headerBehaviorType.getDeclaredField("scroller"); + field.setAccessible(true); + return ((OverScroller) field.get(this)); + } + } catch (NoSuchFieldException | IllegalAccessException e) { + // ? + } + return null; + } + + @Nullable + private Field getLastNestedScrollingChildRefField() { + try { + Class headerBehaviorType = this.getClass().getSuperclass().getSuperclass(); + if (headerBehaviorType != null) { + Field field = headerBehaviorType.getDeclaredField("lastNestedScrollingChildRef"); + field.setAccessible(true); + return field; + } + } catch (NoSuchFieldException e) { + // ? + } + return null; + } + + private void resetNestedScrollingChild(){ + Field field = getLastNestedScrollingChildRefField(); + if(field != null){ + try { + Object value = field.get(this); + if(value != null) field.set(this, null); + } catch (IllegalAccessException e) { + // ? + } + } + } + + private void stopAppBarLayoutFling() { + OverScroller scroller = getScrollerField(); + if (scroller != null) scroller.forceFinished(true); + } + +} \ No newline at end of file diff --git a/app/src/main/java/org/schabi/newpipe/App.java b/app/src/main/java/org/schabi/newpipe/App.java index e72b1ba2309..1da9d380311 100644 --- a/app/src/main/java/org/schabi/newpipe/App.java +++ b/app/src/main/java/org/schabi/newpipe/App.java @@ -6,9 +6,10 @@ import android.app.NotificationManager; import android.content.Context; import android.os.Build; -import android.support.annotation.Nullable; import android.util.Log; +import androidx.annotation.Nullable; + import com.nostra13.universalimageloader.cache.memory.impl.LRULimitedMemoryCache; import com.nostra13.universalimageloader.core.ImageLoader; import com.nostra13.universalimageloader.core.ImageLoaderConfiguration; diff --git a/app/src/main/java/org/schabi/newpipe/BaseFragment.java b/app/src/main/java/org/schabi/newpipe/BaseFragment.java index 4e4cdcc0dfc..ccdb806ef3c 100644 --- a/app/src/main/java/org/schabi/newpipe/BaseFragment.java +++ b/app/src/main/java/org/schabi/newpipe/BaseFragment.java @@ -2,10 +2,10 @@ import android.content.Context; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import android.view.View; diff --git a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java index 6a6d1b9c235..22f7bc55862 100644 --- a/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java +++ b/app/src/main/java/org/schabi/newpipe/CheckForNewAppVersionTask.java @@ -12,21 +12,18 @@ import android.net.Uri; import android.os.AsyncTask; import android.preference.PreferenceManager; -import android.support.v4.app.NotificationCompat; -import android.support.v4.app.NotificationManagerCompat; +import androidx.core.app.NotificationCompat; +import androidx.core.app.NotificationManagerCompat; +import android.util.Log; import org.json.JSONException; import org.json.JSONObject; import org.schabi.newpipe.report.ErrorActivity; import org.schabi.newpipe.report.UserAction; -import java.io.BufferedReader; import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.net.URL; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.security.cert.CertificateEncodingException; @@ -37,7 +34,6 @@ import okhttp3.OkHttpClient; import okhttp3.Request; -import okhttp3.RequestBody; import okhttp3.Response; /** @@ -47,6 +43,8 @@ */ public class CheckForNewAppVersionTask extends AsyncTask { + private static final boolean DEBUG = MainActivity.DEBUG; + private static final String TAG = CheckForNewAppVersionTask.class.getSimpleName(); private static final Application app = App.getApp(); private static final String GITHUB_APK_SHA1 = "B0:2E:90:7C:1C:D6:FC:57:C3:35:F0:88:D0:8F:50:5F:94:E4:D2:15"; private static final String newPipeApiUrl = "https://newpipe.schabi.org/api/data.json"; @@ -90,9 +88,8 @@ protected String doInBackground(Void... voids) { Response response = client.newCall(request).execute(); return response.body().string(); } catch (IOException ex) { - ErrorActivity.reportError(app, ex, null, null, - ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none", - "app update API fail", R.string.app_ui_crash)); + // connectivity problems, do not alarm user and fail silently + if (DEBUG) Log.w(TAG, Log.getStackTraceString(ex)); } return null; @@ -117,9 +114,8 @@ protected void onPostExecute(String response) { compareAppVersionAndShowNotification(versionName, apkLocationUrl, versionCode); } catch (JSONException ex) { - ErrorActivity.reportError(app, ex, null, null, - ErrorActivity.ErrorInfo.make(UserAction.SOMETHING_ELSE, "none", - "could not parse app update JSON data", R.string.app_ui_crash)); + // connectivity problems, do not alarm user and fail silently + if (DEBUG) Log.w(TAG, Log.getStackTraceString(ex)); } } } diff --git a/app/src/main/java/org/schabi/newpipe/Downloader.java b/app/src/main/java/org/schabi/newpipe/Downloader.java index ff274a91adf..ae76d562397 100644 --- a/app/src/main/java/org/schabi/newpipe/Downloader.java +++ b/app/src/main/java/org/schabi/newpipe/Downloader.java @@ -1,6 +1,6 @@ package org.schabi.newpipe; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.text.TextUtils; import org.schabi.newpipe.extractor.DownloadRequest; @@ -10,7 +10,6 @@ import java.io.IOException; import java.io.InputStream; -import java.io.Serializable; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -164,7 +163,7 @@ private ResponseBody getBody(String siteUrl, Map customPropertie final ResponseBody body = response.body(); if (response.code() == 429) { - throw new ReCaptchaException("reCaptcha Challenge requested"); + throw new ReCaptchaException("reCaptcha Challenge requested", siteUrl); } if (body == null) { @@ -214,7 +213,7 @@ public DownloadResponse get(String siteUrl, DownloadRequest request) throws IOEx final ResponseBody body = response.body(); if (response.code() == 429) { - throw new ReCaptchaException("reCaptcha Challenge requested"); + throw new ReCaptchaException("reCaptcha Challenge requested", siteUrl); } if (body == null) { @@ -268,7 +267,7 @@ public DownloadResponse post(String siteUrl, DownloadRequest request) throws IOE final ResponseBody body = response.body(); if (response.code() == 429) { - throw new ReCaptchaException("reCaptcha Challenge requested"); + throw new ReCaptchaException("reCaptcha Challenge requested", siteUrl); } if (body == null) { diff --git a/app/src/main/java/org/schabi/newpipe/MainActivity.java b/app/src/main/java/org/schabi/newpipe/MainActivity.java index a9f2e962239..c24d77d0328 100644 --- a/app/src/main/java/org/schabi/newpipe/MainActivity.java +++ b/app/src/main/java/org/schabi/newpipe/MainActivity.java @@ -28,17 +28,7 @@ import android.os.Handler; import android.os.Looper; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.design.widget.NavigationView; -import android.support.v4.app.Fragment; -import android.support.v4.view.GravityCompat; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBar; -import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.util.Log; -import android.view.Gravity; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; @@ -49,6 +39,17 @@ import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.core.view.GravityCompat; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.fragment.app.Fragment; + +import com.google.android.material.navigation.NavigationView; + import org.schabi.newpipe.extractor.NewPipe; import org.schabi.newpipe.extractor.StreamingService; import org.schabi.newpipe.extractor.exceptions.ExtractionException; @@ -73,6 +74,7 @@ public class MainActivity extends AppCompatActivity { private DrawerLayout drawer = null; private NavigationView drawerItems = null; private TextView headerServiceView = null; + private Button toggleServiceButton = null; private boolean servicesShown = false; private ImageView serviceArrow; @@ -266,8 +268,8 @@ private void setupDrawerHeader() { serviceArrow = hView.findViewById(R.id.drawer_arrow); headerServiceView = hView.findViewById(R.id.drawer_header_service_view); - Button action = hView.findViewById(R.id.drawer_header_action_button); - action.setOnClickListener(view -> { + toggleServiceButton = hView.findViewById(R.id.drawer_header_action_button); + toggleServiceButton.setOnClickListener(view -> { toggleServices(); }); } @@ -279,6 +281,7 @@ private void toggleServices() { drawerItems.getMenu().removeGroup(R.id.menu_tabs_group); drawerItems.getMenu().removeGroup(R.id.menu_options_about_group); + if(servicesShown) { showServices(); } else { @@ -359,11 +362,13 @@ protected void onResume() { // close drawer on return, and don't show animation, so its looks like the drawer isn't open // when the user returns to MainActivity - drawer.closeDrawer(Gravity.START, false); + drawer.closeDrawer(GravityCompat.START, false); try { String selectedServiceName = NewPipe.getService( ServiceHelper.getSelectedServiceId(this)).getServiceInfo().getName(); headerServiceView.setText(selectedServiceName); + toggleServiceButton.setContentDescription( + getString(R.string.drawer_header_description) + selectedServiceName); } catch (Exception e) { ErrorActivity.reportUiError(this, e); } @@ -557,6 +562,14 @@ private void updateDrawerNavigation() { } } + private void updateDrawerHeaderString(String content) { + NavigationView navigationView = findViewById(R.id.navigation); + View hView = navigationView.getHeaderView(0); + Button action = hView.findViewById(R.id.drawer_header_action_button); + + action.setContentDescription(content); + } + private void handleIntent(Intent intent) { try { if (DEBUG) Log.d(TAG, "handleIntent() called with: intent = [" + intent + "]"); diff --git a/app/src/main/java/org/schabi/newpipe/NewPipeDatabase.java b/app/src/main/java/org/schabi/newpipe/NewPipeDatabase.java index 93beddf615c..acb7339ab57 100644 --- a/app/src/main/java/org/schabi/newpipe/NewPipeDatabase.java +++ b/app/src/main/java/org/schabi/newpipe/NewPipeDatabase.java @@ -1,8 +1,8 @@ package org.schabi.newpipe; -import android.arch.persistence.room.Room; +import androidx.room.Room; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.schabi.newpipe.database.AppDatabase; diff --git a/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java b/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java index 74c818bf9f1..7f6af89c18c 100644 --- a/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java +++ b/app/src/main/java/org/schabi/newpipe/ReCaptchaActivity.java @@ -5,13 +5,12 @@ import android.graphics.Bitmap; import android.os.Build; import android.os.Bundle; -import android.support.v4.app.NavUtils; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.core.app.NavUtils; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.MenuItem; import android.webkit.CookieManager; -import android.webkit.ValueCallback; import android.webkit.WebSettings; import android.webkit.WebView; import android.webkit.WebViewClient; @@ -37,15 +36,24 @@ */ public class ReCaptchaActivity extends AppCompatActivity { public static final int RECAPTCHA_REQUEST = 10; + public static final String RECAPTCHA_URL_EXTRA = "recaptcha_url_extra"; public static final String TAG = ReCaptchaActivity.class.toString(); public static final String YT_URL = "https://www.youtube.com"; + private String url; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_recaptcha); + url = getIntent().getStringExtra(RECAPTCHA_URL_EXTRA); + if (url == null || url.isEmpty()) { + url = YT_URL; + } + + // Set return to Cancel by default setResult(RESULT_CANCELED); @@ -73,15 +81,12 @@ protected void onCreate(Bundle savedInstanceState) { myWebView.clearHistory(); android.webkit.CookieManager cookieManager = CookieManager.getInstance(); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - cookieManager.removeAllCookies(new ValueCallback() { - @Override - public void onReceiveValue(Boolean aBoolean) {} - }); + cookieManager.removeAllCookies(aBoolean -> {}); } else { cookieManager.removeAllCookie(); } - myWebView.loadUrl(YT_URL); + myWebView.loadUrl(url); } private class ReCaptchaWebViewClient extends WebViewClient { diff --git a/app/src/main/java/org/schabi/newpipe/RouterActivity.java b/app/src/main/java/org/schabi/newpipe/RouterActivity.java index c7bf4c88109..1be6e096a22 100644 --- a/app/src/main/java/org/schabi/newpipe/RouterActivity.java +++ b/app/src/main/java/org/schabi/newpipe/RouterActivity.java @@ -9,12 +9,12 @@ import android.content.pm.PackageManager; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.NotificationCompat; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.NotificationCompat; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; import android.text.TextUtils; import android.view.ContextThemeWrapper; import android.view.LayoutInflater; @@ -26,6 +26,8 @@ import android.widget.RadioGroup; import android.widget.Toast; +import androidx.fragment.app.FragmentManager; + import org.schabi.newpipe.download.DownloadDialog; import org.schabi.newpipe.extractor.Info; import org.schabi.newpipe.extractor.NewPipe; @@ -74,10 +76,13 @@ */ public class RouterActivity extends AppCompatActivity { - @State protected int currentServiceId = -1; + @State + protected int currentServiceId = -1; private StreamingService currentService; - @State protected LinkType currentLinkType; - @State protected int selectedRadioPosition = -1; + @State + protected LinkType currentLinkType; + @State + protected int selectedRadioPosition = -1; protected int selectedPreviously = -1; protected String currentUrl; @@ -257,7 +262,7 @@ private void showDialog(final List choices) { .setNegativeButton(R.string.just_once, dialogButtonsClickListener) .setPositiveButton(R.string.always, dialogButtonsClickListener) .setOnDismissListener((dialog) -> { - if(!selectionIsDownload) finish(); + if (!selectionIsDownload) finish(); }) .create(); @@ -358,13 +363,13 @@ private void setDialogButtonsState(AlertDialog dialog, boolean state) { positiveButton.setEnabled(state); } - private void handleText(){ + private void handleText() { String searchString = getIntent().getStringExtra(Intent.EXTRA_TEXT); int serviceId = getIntent().getIntExtra(Constants.KEY_SERVICE_ID, 0); Intent intent = new Intent(getThemeWrapperContext(), MainActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); startActivity(intent); - NavigationHelper.openSearch(getThemeWrapperContext(),serviceId,searchString); + NavigationHelper.openSearch(getThemeWrapperContext(), serviceId, searchString); } private void handleChoice(final String selectedChoiceKey) { @@ -397,7 +402,7 @@ private void handleChoice(final String selectedChoiceKey) { .subscribeOn(Schedulers.io()) .observeOn(AndroidSchedulers.mainThread()) .subscribe(intent -> { - if(!internalRoute){ + if (!internalRoute) { intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK); } @@ -430,7 +435,7 @@ private void openDownloadDialog() { int selectedVideoStreamIndex = ListHelper.getDefaultResolutionIndex(this, sortedVideoStreams); - android.support.v4.app.FragmentManager fm = getSupportFragmentManager(); + FragmentManager fm = getSupportFragmentManager(); DownloadDialog downloadDialog = DownloadDialog.newInstance(result); downloadDialog.setVideoStreams(sortedVideoStreams); downloadDialog.setAudioStreams(result.getAudioStreams()); @@ -447,8 +452,8 @@ private void openDownloadDialog() { @Override public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { - for (int i: grantResults){ - if (i == PackageManager.PERMISSION_DENIED){ + for (int i : grantResults) { + if (i == PackageManager.PERMISSION_DENIED) { finish(); return; } @@ -460,7 +465,8 @@ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permis private static class AdapterChoiceItem { final String description, key; - @DrawableRes final int icon; + @DrawableRes + final int icon; AdapterChoiceItem(String key, String description, int icon) { this.description = description; @@ -558,7 +564,8 @@ public Consumer getResultHandler(Choice choice) { final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); boolean isExtVideoEnabled = preferences.getBoolean(getString(R.string.use_external_video_player_key), false); - boolean isExtAudioEnabled = preferences.getBoolean(getString(R.string.use_external_audio_player_key), false);; + boolean isExtAudioEnabled = preferences.getBoolean(getString(R.string.use_external_audio_player_key), false); + ; PlayQueue playQueue; String playerChoice = choice.playerChoice; diff --git a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java index 0450290d289..2326e795ef1 100644 --- a/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java +++ b/app/src/main/java/org/schabi/newpipe/about/AboutActivity.java @@ -4,13 +4,15 @@ import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import com.google.android.material.tabs.TabLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.fragment.app.FragmentStatePagerAdapter; +import androidx.viewpager.widget.PagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; @@ -36,7 +38,6 @@ public class AboutActivity extends AppCompatActivity { new SoftwareComponent("ACRA", "2013", "Kevin Gaudin", "http://www.acra.ch", StandardLicenses.APACHE2), new SoftwareComponent("Universal Image Loader", "2011 - 2015", "Sergey Tarasevich", "https://github.com/nostra13/Android-Universal-Image-Loader", StandardLicenses.APACHE2), new SoftwareComponent("CircleImageView", "2014 - 2017", "Henning Dodenhof", "https://github.com/hdodenhof/CircleImageView", StandardLicenses.APACHE2), - new SoftwareComponent("ParalaxScrollView", "2014", "Nir Hartmann", "https://github.com/nirhart/ParallaxScroll", StandardLicenses.MIT), new SoftwareComponent("NoNonsense-FilePicker", "2016", "Jonas Kalderstam", "https://github.com/spacecowboy/NoNonsense-FilePicker", StandardLicenses.MPL2), new SoftwareComponent("ExoPlayer", "2014-2017", "Google Inc", "https://github.com/google/ExoPlayer", StandardLicenses.APACHE2), new SoftwareComponent("RxAndroid", "2015", "The RxAndroid authors", "https://github.com/ReactiveX/RxAndroid", StandardLicenses.APACHE2), @@ -45,12 +46,12 @@ public class AboutActivity extends AppCompatActivity { }; /** - * The {@link android.support.v4.view.PagerAdapter} that will provide + * The {@link PagerAdapter} that will provide * fragments for each of the sections. We use a * {@link FragmentPagerAdapter} derivative, which will keep every * loaded fragment in memory. If this becomes too memory intensive, it * may be best to switch to a - * {@link android.support.v4.app.FragmentStatePagerAdapter}. + * {@link FragmentStatePagerAdapter}. */ private SectionsPagerAdapter mSectionsPagerAdapter; diff --git a/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java b/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java index 4f6a69dcc1b..fe78ff9f14f 100644 --- a/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java +++ b/app/src/main/java/org/schabi/newpipe/about/LicenseFragment.java @@ -5,8 +5,8 @@ import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import android.view.*; import android.widget.TextView; import org.schabi.newpipe.R; diff --git a/app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.java b/app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.java index 09d33bd8a05..eeafc1f57b6 100644 --- a/app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.java +++ b/app/src/main/java/org/schabi/newpipe/about/LicenseFragmentHelper.java @@ -4,8 +4,8 @@ import android.content.Context; import android.content.DialogInterface; import android.os.AsyncTask; -import android.support.annotation.Nullable; -import android.support.v7.app.AlertDialog; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; import android.webkit.WebView; import org.schabi.newpipe.R; import org.schabi.newpipe.util.ThemeHelper; diff --git a/app/src/main/java/org/schabi/newpipe/database/AppDatabase.java b/app/src/main/java/org/schabi/newpipe/database/AppDatabase.java index e0d2df3f4cd..59309430504 100644 --- a/app/src/main/java/org/schabi/newpipe/database/AppDatabase.java +++ b/app/src/main/java/org/schabi/newpipe/database/AppDatabase.java @@ -1,8 +1,8 @@ package org.schabi.newpipe.database; -import android.arch.persistence.room.Database; -import android.arch.persistence.room.RoomDatabase; -import android.arch.persistence.room.TypeConverters; +import androidx.room.Database; +import androidx.room.RoomDatabase; +import androidx.room.TypeConverters; import org.schabi.newpipe.database.history.dao.SearchHistoryDAO; import org.schabi.newpipe.database.history.dao.StreamHistoryDAO; diff --git a/app/src/main/java/org/schabi/newpipe/database/BasicDAO.java b/app/src/main/java/org/schabi/newpipe/database/BasicDAO.java index 13117145aeb..b7381b9f1f5 100644 --- a/app/src/main/java/org/schabi/newpipe/database/BasicDAO.java +++ b/app/src/main/java/org/schabi/newpipe/database/BasicDAO.java @@ -1,10 +1,10 @@ package org.schabi.newpipe.database; -import android.arch.persistence.room.Dao; -import android.arch.persistence.room.Delete; -import android.arch.persistence.room.Insert; -import android.arch.persistence.room.OnConflictStrategy; -import android.arch.persistence.room.Update; +import androidx.room.Dao; +import androidx.room.Delete; +import androidx.room.Insert; +import androidx.room.OnConflictStrategy; +import androidx.room.Update; import java.util.Collection; import java.util.List; diff --git a/app/src/main/java/org/schabi/newpipe/database/Converters.java b/app/src/main/java/org/schabi/newpipe/database/Converters.java index d48fbfaf14e..bb781d194b4 100644 --- a/app/src/main/java/org/schabi/newpipe/database/Converters.java +++ b/app/src/main/java/org/schabi/newpipe/database/Converters.java @@ -1,6 +1,6 @@ package org.schabi.newpipe.database; -import android.arch.persistence.room.TypeConverter; +import androidx.room.TypeConverter; import org.schabi.newpipe.extractor.stream.StreamType; diff --git a/app/src/main/java/org/schabi/newpipe/database/Migrations.java b/app/src/main/java/org/schabi/newpipe/database/Migrations.java index e51a1c78a11..f14d065dbd2 100644 --- a/app/src/main/java/org/schabi/newpipe/database/Migrations.java +++ b/app/src/main/java/org/schabi/newpipe/database/Migrations.java @@ -1,8 +1,11 @@ package org.schabi.newpipe.database; -import android.arch.persistence.db.SupportSQLiteDatabase; -import android.arch.persistence.room.migration.Migration; -import android.support.annotation.NonNull; +import androidx.sqlite.db.SupportSQLiteDatabase; +import androidx.room.migration.Migration; +import androidx.annotation.NonNull; +import android.util.Log; + +import org.schabi.newpipe.BuildConfig; public class Migrations { @@ -10,9 +13,15 @@ public class Migrations { public static final int DB_VER_12_0 = 2; public static final int DB_VER_13_0 = 3; + public static final boolean DEBUG = !BuildConfig.BUILD_TYPE.equals("release"); + private static final String TAG = Migrations.class.getName(); + public static final Migration MIGRATION_11_12 = new Migration(DB_VER_11_0, DB_VER_12_0) { @Override public void migrate(@NonNull SupportSQLiteDatabase database) { + if(DEBUG) { + Log.d(TAG, "Start migrating database"); + } /* * Unfortunately these queries must be hardcoded due to the possibility of * schema and names changing at a later date, thus invalidating the older migration @@ -57,6 +66,10 @@ public void migrate(@NonNull SupportSQLiteDatabase database) { "ORDER BY creation_date DESC"); database.execSQL("DROP TABLE IF EXISTS watch_history"); + + if(DEBUG) { + Log.d(TAG, "Stop migrating database"); + } } }; diff --git a/app/src/main/java/org/schabi/newpipe/database/history/dao/SearchHistoryDAO.java b/app/src/main/java/org/schabi/newpipe/database/history/dao/SearchHistoryDAO.java index 83e629e489f..df8094830d2 100644 --- a/app/src/main/java/org/schabi/newpipe/database/history/dao/SearchHistoryDAO.java +++ b/app/src/main/java/org/schabi/newpipe/database/history/dao/SearchHistoryDAO.java @@ -1,8 +1,8 @@ package org.schabi.newpipe.database.history.dao; -import android.arch.persistence.room.Dao; -import android.arch.persistence.room.Query; -import android.support.annotation.Nullable; +import androidx.room.Dao; +import androidx.room.Query; +import androidx.annotation.Nullable; import org.schabi.newpipe.database.history.model.SearchHistoryEntry; diff --git a/app/src/main/java/org/schabi/newpipe/database/history/dao/StreamHistoryDAO.java b/app/src/main/java/org/schabi/newpipe/database/history/dao/StreamHistoryDAO.java index 50d723f1fd6..2703b9783c9 100644 --- a/app/src/main/java/org/schabi/newpipe/database/history/dao/StreamHistoryDAO.java +++ b/app/src/main/java/org/schabi/newpipe/database/history/dao/StreamHistoryDAO.java @@ -1,9 +1,9 @@ package org.schabi.newpipe.database.history.dao; -import android.arch.persistence.room.Dao; -import android.arch.persistence.room.Query; -import android.support.annotation.Nullable; +import androidx.room.Dao; +import androidx.room.Query; +import androidx.annotation.Nullable; import org.schabi.newpipe.database.history.model.StreamHistoryEntry; import org.schabi.newpipe.database.stream.StreamStatisticsEntry; diff --git a/app/src/main/java/org/schabi/newpipe/database/history/model/SearchHistoryEntry.java b/app/src/main/java/org/schabi/newpipe/database/history/model/SearchHistoryEntry.java index dcfff99b8a2..222ef0a59bc 100644 --- a/app/src/main/java/org/schabi/newpipe/database/history/model/SearchHistoryEntry.java +++ b/app/src/main/java/org/schabi/newpipe/database/history/model/SearchHistoryEntry.java @@ -1,10 +1,10 @@ package org.schabi.newpipe.database.history.model; -import android.arch.persistence.room.ColumnInfo; -import android.arch.persistence.room.Entity; -import android.arch.persistence.room.Ignore; -import android.arch.persistence.room.Index; -import android.arch.persistence.room.PrimaryKey; +import androidx.room.ColumnInfo; +import androidx.room.Entity; +import androidx.room.Ignore; +import androidx.room.Index; +import androidx.room.PrimaryKey; import java.util.Date; diff --git a/app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntity.java b/app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntity.java index b553f437d8c..64bdf34de7f 100644 --- a/app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntity.java +++ b/app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntity.java @@ -1,17 +1,17 @@ package org.schabi.newpipe.database.history.model; -import android.arch.persistence.room.ColumnInfo; -import android.arch.persistence.room.Entity; -import android.arch.persistence.room.ForeignKey; -import android.arch.persistence.room.Ignore; -import android.arch.persistence.room.Index; -import android.support.annotation.NonNull; +import androidx.room.ColumnInfo; +import androidx.room.Entity; +import androidx.room.ForeignKey; +import androidx.room.Ignore; +import androidx.room.Index; +import androidx.annotation.NonNull; import org.schabi.newpipe.database.stream.model.StreamEntity; import java.util.Date; -import static android.arch.persistence.room.ForeignKey.CASCADE; +import static androidx.room.ForeignKey.CASCADE; import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.STREAM_HISTORY_TABLE; import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.JOIN_STREAM_ID; import static org.schabi.newpipe.database.history.model.StreamHistoryEntity.STREAM_ACCESS_DATE; diff --git a/app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntry.java b/app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntry.java index 772b96cc421..ad66451e477 100644 --- a/app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntry.java +++ b/app/src/main/java/org/schabi/newpipe/database/history/model/StreamHistoryEntry.java @@ -1,6 +1,6 @@ package org.schabi.newpipe.database.history.model; -import android.arch.persistence.room.ColumnInfo; +import androidx.room.ColumnInfo; import org.schabi.newpipe.database.stream.model.StreamEntity; import org.schabi.newpipe.extractor.stream.StreamType; diff --git a/app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistMetadataEntry.java b/app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistMetadataEntry.java index 6d9fc221309..252ca07f06d 100644 --- a/app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistMetadataEntry.java +++ b/app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistMetadataEntry.java @@ -1,6 +1,6 @@ package org.schabi.newpipe.database.playlist; -import android.arch.persistence.room.ColumnInfo; +import androidx.room.ColumnInfo; import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_ID; import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_NAME; diff --git a/app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistStreamEntry.java b/app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistStreamEntry.java index b6ecfe1f017..fb45c356471 100644 --- a/app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistStreamEntry.java +++ b/app/src/main/java/org/schabi/newpipe/database/playlist/PlaylistStreamEntry.java @@ -1,6 +1,6 @@ package org.schabi.newpipe.database.playlist; -import android.arch.persistence.room.ColumnInfo; +import androidx.room.ColumnInfo; import org.schabi.newpipe.database.LocalItem; import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity; diff --git a/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistDAO.java b/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistDAO.java index 7a6282f9647..f5a685a7c7e 100644 --- a/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistDAO.java +++ b/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistDAO.java @@ -1,7 +1,7 @@ package org.schabi.newpipe.database.playlist.dao; -import android.arch.persistence.room.Dao; -import android.arch.persistence.room.Query; +import androidx.room.Dao; +import androidx.room.Query; import org.schabi.newpipe.database.BasicDAO; import org.schabi.newpipe.database.playlist.model.PlaylistEntity; diff --git a/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistRemoteDAO.java b/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistRemoteDAO.java index 82d767b07c6..b7ccf42f783 100644 --- a/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistRemoteDAO.java +++ b/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistRemoteDAO.java @@ -1,8 +1,8 @@ package org.schabi.newpipe.database.playlist.dao; -import android.arch.persistence.room.Dao; -import android.arch.persistence.room.Query; -import android.arch.persistence.room.Transaction; +import androidx.room.Dao; +import androidx.room.Query; +import androidx.room.Transaction; import org.schabi.newpipe.database.BasicDAO; import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity; diff --git a/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistStreamDAO.java b/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistStreamDAO.java index 8b6d62ca465..656fc27fced 100644 --- a/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistStreamDAO.java +++ b/app/src/main/java/org/schabi/newpipe/database/playlist/dao/PlaylistStreamDAO.java @@ -1,8 +1,8 @@ package org.schabi.newpipe.database.playlist.dao; -import android.arch.persistence.room.Dao; -import android.arch.persistence.room.Query; -import android.arch.persistence.room.Transaction; +import androidx.room.Dao; +import androidx.room.Query; +import androidx.room.Transaction; import org.schabi.newpipe.database.BasicDAO; import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry; diff --git a/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistEntity.java b/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistEntity.java index bfda8eeec56..9d7989b21b5 100644 --- a/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistEntity.java +++ b/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistEntity.java @@ -1,9 +1,9 @@ package org.schabi.newpipe.database.playlist.model; -import android.arch.persistence.room.ColumnInfo; -import android.arch.persistence.room.Entity; -import android.arch.persistence.room.Index; -import android.arch.persistence.room.PrimaryKey; +import androidx.room.ColumnInfo; +import androidx.room.Entity; +import androidx.room.Index; +import androidx.room.PrimaryKey; import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_NAME; import static org.schabi.newpipe.database.playlist.model.PlaylistEntity.PLAYLIST_TABLE; diff --git a/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistRemoteEntity.java b/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistRemoteEntity.java index ab917a22bbe..bf446ca1f55 100644 --- a/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistRemoteEntity.java +++ b/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistRemoteEntity.java @@ -1,10 +1,10 @@ package org.schabi.newpipe.database.playlist.model; -import android.arch.persistence.room.ColumnInfo; -import android.arch.persistence.room.Entity; -import android.arch.persistence.room.Ignore; -import android.arch.persistence.room.Index; -import android.arch.persistence.room.PrimaryKey; +import androidx.room.ColumnInfo; +import androidx.room.Entity; +import androidx.room.Ignore; +import androidx.room.Index; +import androidx.room.PrimaryKey; import org.schabi.newpipe.database.playlist.PlaylistLocalItem; import org.schabi.newpipe.extractor.playlist.PlaylistInfo; diff --git a/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistStreamEntity.java b/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistStreamEntity.java index a5b2e8248fa..87afdb4f92d 100644 --- a/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistStreamEntity.java +++ b/app/src/main/java/org/schabi/newpipe/database/playlist/model/PlaylistStreamEntity.java @@ -1,13 +1,13 @@ package org.schabi.newpipe.database.playlist.model; -import android.arch.persistence.room.ColumnInfo; -import android.arch.persistence.room.Entity; -import android.arch.persistence.room.ForeignKey; -import android.arch.persistence.room.Index; +import androidx.room.ColumnInfo; +import androidx.room.Entity; +import androidx.room.ForeignKey; +import androidx.room.Index; import org.schabi.newpipe.database.stream.model.StreamEntity; -import static android.arch.persistence.room.ForeignKey.CASCADE; +import static androidx.room.ForeignKey.CASCADE; import static org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity.JOIN_INDEX; import static org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity.JOIN_PLAYLIST_ID; import static org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity.JOIN_STREAM_ID; diff --git a/app/src/main/java/org/schabi/newpipe/database/stream/StreamStatisticsEntry.java b/app/src/main/java/org/schabi/newpipe/database/stream/StreamStatisticsEntry.java index 6909f33970b..9b61eb4690b 100644 --- a/app/src/main/java/org/schabi/newpipe/database/stream/StreamStatisticsEntry.java +++ b/app/src/main/java/org/schabi/newpipe/database/stream/StreamStatisticsEntry.java @@ -1,6 +1,6 @@ package org.schabi.newpipe.database.stream; -import android.arch.persistence.room.ColumnInfo; +import androidx.room.ColumnInfo; import org.schabi.newpipe.database.LocalItem; import org.schabi.newpipe.database.history.model.StreamHistoryEntity; diff --git a/app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.java b/app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.java index 35f4716bbb2..e77b7857b48 100644 --- a/app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.java +++ b/app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamDAO.java @@ -1,10 +1,10 @@ package org.schabi.newpipe.database.stream.dao; -import android.arch.persistence.room.Dao; -import android.arch.persistence.room.Insert; -import android.arch.persistence.room.OnConflictStrategy; -import android.arch.persistence.room.Query; -import android.arch.persistence.room.Transaction; +import androidx.room.Dao; +import androidx.room.Insert; +import androidx.room.OnConflictStrategy; +import androidx.room.Query; +import androidx.room.Transaction; import org.schabi.newpipe.database.BasicDAO; import org.schabi.newpipe.database.playlist.model.PlaylistStreamEntity; diff --git a/app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamStateDAO.java b/app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamStateDAO.java index 1c06f4df9b9..c8581098403 100644 --- a/app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamStateDAO.java +++ b/app/src/main/java/org/schabi/newpipe/database/stream/dao/StreamStateDAO.java @@ -1,10 +1,10 @@ package org.schabi.newpipe.database.stream.dao; -import android.arch.persistence.room.Dao; -import android.arch.persistence.room.Insert; -import android.arch.persistence.room.OnConflictStrategy; -import android.arch.persistence.room.Query; -import android.arch.persistence.room.Transaction; +import androidx.room.Dao; +import androidx.room.Insert; +import androidx.room.OnConflictStrategy; +import androidx.room.Query; +import androidx.room.Transaction; import org.schabi.newpipe.database.BasicDAO; import org.schabi.newpipe.database.stream.model.StreamStateEntity; diff --git a/app/src/main/java/org/schabi/newpipe/database/stream/model/StreamEntity.java b/app/src/main/java/org/schabi/newpipe/database/stream/model/StreamEntity.java index d6cab10907b..1f26e214d9a 100644 --- a/app/src/main/java/org/schabi/newpipe/database/stream/model/StreamEntity.java +++ b/app/src/main/java/org/schabi/newpipe/database/stream/model/StreamEntity.java @@ -1,10 +1,10 @@ package org.schabi.newpipe.database.stream.model; -import android.arch.persistence.room.ColumnInfo; -import android.arch.persistence.room.Entity; -import android.arch.persistence.room.Ignore; -import android.arch.persistence.room.Index; -import android.arch.persistence.room.PrimaryKey; +import androidx.room.ColumnInfo; +import androidx.room.Entity; +import androidx.room.Ignore; +import androidx.room.Index; +import androidx.room.PrimaryKey; import org.schabi.newpipe.extractor.stream.StreamInfo; import org.schabi.newpipe.extractor.stream.StreamInfoItem; diff --git a/app/src/main/java/org/schabi/newpipe/database/stream/model/StreamStateEntity.java b/app/src/main/java/org/schabi/newpipe/database/stream/model/StreamStateEntity.java index d46d5cd7492..8630bfa5354 100644 --- a/app/src/main/java/org/schabi/newpipe/database/stream/model/StreamStateEntity.java +++ b/app/src/main/java/org/schabi/newpipe/database/stream/model/StreamStateEntity.java @@ -1,14 +1,14 @@ package org.schabi.newpipe.database.stream.model; -import android.arch.persistence.room.ColumnInfo; -import android.arch.persistence.room.Entity; -import android.arch.persistence.room.ForeignKey; -import android.support.annotation.Nullable; +import androidx.room.ColumnInfo; +import androidx.room.Entity; +import androidx.room.ForeignKey; +import androidx.annotation.Nullable; import java.util.concurrent.TimeUnit; -import static android.arch.persistence.room.ForeignKey.CASCADE; +import static androidx.room.ForeignKey.CASCADE; import static org.schabi.newpipe.database.stream.model.StreamStateEntity.JOIN_STREAM_ID; import static org.schabi.newpipe.database.stream.model.StreamStateEntity.STREAM_STATE_TABLE; diff --git a/app/src/main/java/org/schabi/newpipe/database/subscription/NotificationMode.java b/app/src/main/java/org/schabi/newpipe/database/subscription/NotificationMode.java index 43983f864b6..2fe9584aaec 100644 --- a/app/src/main/java/org/schabi/newpipe/database/subscription/NotificationMode.java +++ b/app/src/main/java/org/schabi/newpipe/database/subscription/NotificationMode.java @@ -1,6 +1,6 @@ package org.schabi.newpipe.database.subscription; -import android.support.annotation.IntDef; +import androidx.annotation.IntDef; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/app/src/main/java/org/schabi/newpipe/database/subscription/SubscriptionDAO.java b/app/src/main/java/org/schabi/newpipe/database/subscription/SubscriptionDAO.java index ee6dea9fedb..0869d60ff9c 100644 --- a/app/src/main/java/org/schabi/newpipe/database/subscription/SubscriptionDAO.java +++ b/app/src/main/java/org/schabi/newpipe/database/subscription/SubscriptionDAO.java @@ -1,10 +1,10 @@ package org.schabi.newpipe.database.subscription; -import android.arch.persistence.room.Dao; -import android.arch.persistence.room.Insert; -import android.arch.persistence.room.OnConflictStrategy; -import android.arch.persistence.room.Query; -import android.arch.persistence.room.Transaction; +import androidx.room.Dao; +import androidx.room.Insert; +import androidx.room.OnConflictStrategy; +import androidx.room.Query; +import androidx.room.Transaction; import org.schabi.newpipe.database.BasicDAO; diff --git a/app/src/main/java/org/schabi/newpipe/database/subscription/SubscriptionEntity.java b/app/src/main/java/org/schabi/newpipe/database/subscription/SubscriptionEntity.java index 7e1527fdea2..1b9feb7b34c 100644 --- a/app/src/main/java/org/schabi/newpipe/database/subscription/SubscriptionEntity.java +++ b/app/src/main/java/org/schabi/newpipe/database/subscription/SubscriptionEntity.java @@ -1,11 +1,11 @@ package org.schabi.newpipe.database.subscription; -import android.arch.persistence.room.ColumnInfo; -import android.arch.persistence.room.Entity; -import android.arch.persistence.room.Ignore; -import android.arch.persistence.room.Index; -import android.arch.persistence.room.PrimaryKey; -import android.support.annotation.NonNull; +import androidx.room.ColumnInfo; +import androidx.room.Entity; +import androidx.room.Ignore; +import androidx.room.Index; +import androidx.room.PrimaryKey; +import androidx.annotation.NonNull; import org.schabi.newpipe.extractor.channel.ChannelInfo; import org.schabi.newpipe.extractor.channel.ChannelInfoItem; diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java index 41971dfd48d..449a790e842 100644 --- a/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java +++ b/app/src/main/java/org/schabi/newpipe/download/DownloadActivity.java @@ -3,9 +3,9 @@ import android.app.FragmentTransaction; import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; @@ -61,6 +61,7 @@ private void updateFragments() { .commit(); } + @Override public boolean onCreateOptionsMenu(Menu menu) { super.onCreateOptionsMenu(menu); MenuInflater inflater = getMenuInflater(); @@ -86,9 +87,4 @@ public boolean onOptionsItemSelected(MenuItem item) { return super.onOptionsItemSelected(item); } } - - @Override - public void onRestoreInstanceState(Bundle inState){ - super.onRestoreInstanceState(inState); - } } diff --git a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java index 56ea9366d37..1d536ea1a73 100644 --- a/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java +++ b/app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java @@ -8,17 +8,18 @@ import android.content.SharedPreferences; import android.net.Uri; import android.os.Bundle; +import android.os.Environment; import android.os.IBinder; import android.preference.PreferenceManager; -import android.support.annotation.IdRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.app.DialogFragment; -import android.support.v4.provider.DocumentFile; -import android.support.v7.app.AlertDialog; -import android.support.v7.view.menu.ActionMenuItemView; -import android.support.v7.widget.Toolbar; +import androidx.annotation.IdRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.fragment.app.DialogFragment; +import androidx.documentfile.provider.DocumentFile; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.view.menu.ActionMenuItemView; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.util.SparseArray; import android.view.LayoutInflater; @@ -33,6 +34,8 @@ import android.widget.TextView; import android.widget.Toast; +import com.nononsenseapps.filepicker.Utils; + import org.schabi.newpipe.MainActivity; import org.schabi.newpipe.R; import org.schabi.newpipe.extractor.MediaFormat; @@ -45,6 +48,8 @@ import org.schabi.newpipe.extractor.utils.Localization; import org.schabi.newpipe.report.ErrorActivity; import org.schabi.newpipe.report.UserAction; +import org.schabi.newpipe.settings.NewPipeSettings; +import org.schabi.newpipe.util.FilePickerActivityHelper; import org.schabi.newpipe.util.FilenameUtils; import org.schabi.newpipe.util.ListHelper; import org.schabi.newpipe.util.PermissionHelper; @@ -53,6 +58,7 @@ import org.schabi.newpipe.util.StreamItemAdapter.StreamSizeWrapper; import org.schabi.newpipe.util.ThemeHelper; +import java.io.File; import java.io.IOException; import java.util.ArrayList; import java.util.Collections; @@ -73,7 +79,7 @@ public class DownloadDialog extends DialogFragment implements RadioGroup.OnCheckedChangeListener, AdapterView.OnItemSelectedListener { private static final String TAG = "DialogFragment"; private static final boolean DEBUG = MainActivity.DEBUG; - private static final int REQUEST_DOWNLOAD_PATH_SAF = 0x1230; + private static final int REQUEST_DOWNLOAD_SAVE_AS = 0x1230; @State protected StreamInfo currentInfo; @@ -173,6 +179,7 @@ public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); if (DEBUG) Log.d(TAG, "onCreate() called with: savedInstanceState = [" + savedInstanceState + "]"); + if (!PermissionHelper.checkStoragePermissions(getActivity(), PermissionHelper.DOWNLOAD_DIALOG_REQUEST_CODE)) { getDialog().dismiss(); return; @@ -217,32 +224,6 @@ public void onServiceConnected(ComponentName cname, IBinder service) { okButton.setEnabled(true); context.unbindService(this); - - // check of download paths are defined - if (!askForSavePath) { - String msg = ""; - if (mainStorageVideo == null) msg += getString(R.string.download_path_title); - if (mainStorageAudio == null) - msg += getString(R.string.download_path_audio_title); - - if (!msg.isEmpty()) { - String title; - if (mainStorageVideo == null && mainStorageAudio == null) { - title = getString(R.string.general_error); - msg = getString(R.string.no_available_dir) + ":\n" + msg; - } else { - title = msg; - msg = getString(R.string.no_available_dir); - } - - new AlertDialog.Builder(context) - .setPositiveButton(android.R.string.ok, null) - .setTitle(title) - .setMessage(msg) - .create() - .show(); - } - } } @Override @@ -342,12 +323,18 @@ public void onSaveInstanceState(@NonNull Bundle outState) { public void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - if (requestCode == REQUEST_DOWNLOAD_PATH_SAF && resultCode == Activity.RESULT_OK) { + if (requestCode == REQUEST_DOWNLOAD_SAVE_AS && resultCode == Activity.RESULT_OK) { if (data.getData() == null) { showFailedDialog(R.string.general_error); return; } + if (FilePickerActivityHelper.isOwnFileUri(context, data.getData())) { + File file = Utils.getFileForUri(data.getData()); + checkSelectedDownload(null, Uri.fromFile(file), file.getName(), StoredFileHelper.DEFAULT_MIME); + return; + } + DocumentFile docFile = DocumentFile.fromSingleUri(context, data.getData()); if (docFile == null) { showFailedDialog(R.string.general_error); @@ -372,6 +359,7 @@ private void initToolbar(Toolbar toolbar) { toolbar.setNavigationIcon(isLight ? R.drawable.ic_arrow_back_black_24dp : R.drawable.ic_arrow_back_white_24dp); toolbar.inflateMenu(R.menu.dialog_url); toolbar.setNavigationOnClickListener(v -> getDialog().dismiss()); + toolbar.setNavigationContentDescription(R.string.cancel); okButton = toolbar.findViewById(R.id.okay); okButton.setEnabled(false);// disable until the download service connection is done @@ -600,9 +588,27 @@ private void prepareSelectedDownload() { // This part is called if with SAF preferred: // * older android version running // * save path not defined (via download settings) - // * the user as checked the "ask where to download" option + // * the user checked the "ask where to download" option + + if (!askForSavePath) + Toast.makeText(context, getString(R.string.no_available_dir), Toast.LENGTH_LONG).show(); + + if (NewPipeSettings.useStorageAccessFramework(context)) { + StoredFileHelper.requestSafWithFileCreation(this, REQUEST_DOWNLOAD_SAVE_AS, filename, mime); + } else { + File initialSavePath; + if (radioStreamsGroup.getCheckedRadioButtonId() == R.id.audio_button) + initialSavePath = NewPipeSettings.getDir(Environment.DIRECTORY_MUSIC); + else + initialSavePath = NewPipeSettings.getDir(Environment.DIRECTORY_MOVIES); + + initialSavePath = new File(initialSavePath, filename); + startActivityForResult( + FilePickerActivityHelper.chooseFileToSave(context, initialSavePath.getAbsolutePath()), + REQUEST_DOWNLOAD_SAVE_AS + ); + } - StoredFileHelper.requestSafWithFileCreation(this, REQUEST_DOWNLOAD_PATH_SAF, filename, mime); return; } @@ -652,6 +658,11 @@ private void checkSelectedDownload(StoredDirectoryHelper mainStorage, Uri target // This part is called if: // * using SAF on older android version // * save path not defined + // * if the file exists overwrite it, is not necessary ask + if (!storage.existsAsFile() && !storage.create()) { + showFailedDialog(R.string.error_file_creation); + return; + } continueSelectedDownload(storage); return; } else if (targetFile == null) { @@ -756,7 +767,7 @@ private void continueSelectedDownload(@NonNull StoredFileHelper storage) { try { if (storage.length() > 0) storage.truncate(); } catch (IOException e) { - Log.e(TAG, "failed to overwrite the file: " + storage.getUri().toString(), e); + Log.e(TAG, "failed to truncate the file: " + storage.getUri().toString(), e); showFailedDialog(R.string.overwrite_failed); return; } @@ -773,7 +784,6 @@ private void continueSelectedDownload(@NonNull StoredFileHelper storage) { // more download logic: select muxer, subtitle converter, etc. switch (radioStreamsGroup.getCheckedRadioButtonId()) { case R.id.audio_button: - threads = 1;// use unique thread for subtitles due small file size kind = 'a'; selectedStream = audioStreamsAdapter.getItem(selectedAudioIndex); @@ -808,6 +818,7 @@ private void continueSelectedDownload(@NonNull StoredFileHelper storage) { } break; case R.id.subtitle_button: + threads = 1;// use unique thread for subtitles due small file size kind = 's'; selectedStream = subtitleStreamsAdapter.getItem(selectedSubtitleIndex); diff --git a/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java index 4546483d223..8e328266e4e 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/BaseStateFragment.java @@ -1,10 +1,9 @@ package org.schabi.newpipe.fragments; import android.content.Intent; -import android.net.Uri; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; import android.util.Log; import android.view.View; import android.widget.Button; @@ -180,7 +179,7 @@ protected boolean onError(Throwable exception) { } if (exception instanceof ReCaptchaException) { - onReCaptchaException(); + onReCaptchaException((ReCaptchaException) exception); return true; } else if (exception instanceof IOException) { showError(getString(R.string.network_error), true); @@ -190,11 +189,13 @@ protected boolean onError(Throwable exception) { return false; } - public void onReCaptchaException() { + public void onReCaptchaException(ReCaptchaException exception) { if (DEBUG) Log.d(TAG, "onReCaptchaException() called"); Toast.makeText(activity, R.string.recaptcha_request_toast, Toast.LENGTH_LONG).show(); // Starting ReCaptcha Challenge Activity - startActivityForResult(new Intent(activity, ReCaptchaActivity.class), ReCaptchaActivity.RECAPTCHA_REQUEST); + Intent intent = new Intent(activity, ReCaptchaActivity.class); + intent.putExtra(ReCaptchaActivity.RECAPTCHA_URL_EXTRA, exception.getUrl()); + startActivityForResult(intent, ReCaptchaActivity.RECAPTCHA_REQUEST); showError(getString(R.string.recaptcha_request_toast), false); } diff --git a/app/src/main/java/org/schabi/newpipe/fragments/BlankFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/BlankFragment.java index 948e9377d91..1e284c71117 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/BlankFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/BlankFragment.java @@ -1,7 +1,7 @@ package org.schabi.newpipe.fragments; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/org/schabi/newpipe/fragments/EmptyFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/EmptyFragment.java index 0666667d648..de9716f280a 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/EmptyFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/EmptyFragment.java @@ -1,7 +1,7 @@ package org.schabi.newpipe.fragments; import android.os.Bundle; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java index de14997ef1b..e0661a49f49 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/MainFragment.java @@ -1,15 +1,6 @@ package org.schabi.newpipe.fragments; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; @@ -18,6 +9,17 @@ import android.view.View; import android.view.ViewGroup; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.viewpager.widget.ViewPager; + +import com.google.android.material.tabs.TabLayout; + import org.schabi.newpipe.BaseFragment; import org.schabi.newpipe.R; import org.schabi.newpipe.extractor.exceptions.ExtractionException; @@ -50,6 +52,8 @@ public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setHasOptionsMenu(true); + destroyOldFragments(); + tabsManager = TabsManager.getManager(activity); tabsManager.setSavedTabsListener(() -> { if (DEBUG) { @@ -63,6 +67,17 @@ public void onCreate(Bundle savedInstanceState) { }); } + private void destroyOldFragments() { + for (Fragment fragment : getChildFragmentManager().getFragments()) { + if (fragment != null) { + getChildFragmentManager() + .beginTransaction() + .remove(fragment) + .commitNowAllowingStateLoss(); + } + } + } + @Override public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { return inflater.inflate(R.layout.fragment_main, container, false); @@ -98,6 +113,7 @@ public void onResume() { public void onDestroy() { super.onDestroy(); tabsManager.unsetSavedTabsListener(); + if (viewPager != null) viewPager.setAdapter(null); } /*////////////////////////////////////////////////////////////////////////// @@ -144,6 +160,7 @@ public void updateTabs() { viewPager.setOffscreenPageLimit(pagerAdapter.getCount()); updateTabsIcon(); + updateTabsContentDescription(); updateCurrentTitle(); } @@ -156,6 +173,17 @@ private void updateTabsIcon() { } } + private void updateTabsContentDescription() { + for (int i = 0; i < tabsList.size(); i++) { + final TabLayout.Tab tabToSet = tabLayout.getTabAt(i); + if (tabToSet != null) { + final Tab t = tabsList.get(i); + tabToSet.setIcon(t.getTabIconRes(activity)); + tabToSet.setContentDescription(t.getTabName(activity)); + } + } + } + private void updateCurrentTitle() { setTitle(tabsList.get(viewPager.getCurrentItem()).getTabName(requireContext())); } @@ -177,6 +205,7 @@ public void onTabReselected(TabLayout.Tab tab) { } private class SelectedTabsPagerAdapter extends FragmentPagerAdapter { + private SelectedTabsPagerAdapter(FragmentManager fragmentManager) { super(fragmentManager); } diff --git a/app/src/main/java/org/schabi/newpipe/fragments/OnScrollBelowItemsListener.java b/app/src/main/java/org/schabi/newpipe/fragments/OnScrollBelowItemsListener.java index 774e6cc0377..88709767973 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/OnScrollBelowItemsListener.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/OnScrollBelowItemsListener.java @@ -1,8 +1,8 @@ package org.schabi.newpipe.fragments; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.StaggeredGridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.StaggeredGridLayoutManager; /** * Recycler view scroll listener which calls the method {@link #onScrolledDown(RecyclerView)} diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/TabAdaptor.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/TabAdaptor.java index 8314f953975..d86226e9266 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/detail/TabAdaptor.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/TabAdaptor.java @@ -1,9 +1,9 @@ package org.schabi.newpipe.fragments.detail; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; import android.view.ViewGroup; import java.util.ArrayList; diff --git a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java index c80aa565819..37d8851ea42 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java @@ -9,17 +9,17 @@ import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.AppBarLayout; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.content.ContextCompat; -import android.support.v4.view.ViewPager; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.appbar.AppBarLayout; +import com.google.android.material.tabs.TabLayout; +import androidx.fragment.app.Fragment; +import androidx.core.content.ContextCompat; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; import android.text.Html; import android.text.Spanned; import android.text.TextUtils; @@ -60,7 +60,6 @@ import org.schabi.newpipe.extractor.stream.AudioStream; import org.schabi.newpipe.extractor.stream.Stream; import org.schabi.newpipe.extractor.stream.StreamInfo; -import org.schabi.newpipe.extractor.stream.StreamInfoItem; import org.schabi.newpipe.extractor.stream.StreamType; import org.schabi.newpipe.extractor.stream.VideoStream; import org.schabi.newpipe.fragments.BackPressable; @@ -68,7 +67,6 @@ import org.schabi.newpipe.fragments.EmptyFragment; import org.schabi.newpipe.fragments.list.comments.CommentsFragment; import org.schabi.newpipe.fragments.list.videos.RelatedVideosFragment; -import org.schabi.newpipe.info_list.InfoItemDialog; import org.schabi.newpipe.local.dialog.PlaylistAppendDialog; import org.schabi.newpipe.local.history.HistoryRecordManager; import org.schabi.newpipe.player.MainVideoPlayer; @@ -77,7 +75,6 @@ import org.schabi.newpipe.player.playqueue.SinglePlayQueue; import org.schabi.newpipe.report.ErrorActivity; import org.schabi.newpipe.report.UserAction; -import org.schabi.newpipe.util.AnimationUtils; import org.schabi.newpipe.util.Constants; import org.schabi.newpipe.util.ExtractorHelper; import org.schabi.newpipe.util.ImageDisplayConstants; @@ -93,7 +90,6 @@ import java.io.Serializable; import java.util.Collection; -import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.concurrent.TimeUnit; @@ -488,7 +484,6 @@ protected void initViews(View rootView, Bundle savedInstanceState) { videoDescriptionView.setMovementMethod(LinkMovementMethod.getInstance()); videoDescriptionView.setAutoLinkMask(Linkify.WEB_URLS); - //thumbsRootLayout = rootView.findViewById(R.id.detail_thumbs_root_layout); thumbsUpTextView = rootView.findViewById(R.id.detail_thumbs_up_count_view); thumbsUpImageView = rootView.findViewById(R.id.detail_thumbs_up_img_view); thumbsDownTextView = rootView.findViewById(R.id.detail_thumbs_down_count_view); @@ -534,42 +529,6 @@ protected void initListeners() { detailControlsPopup.setOnTouchListener(getOnControlsTouchListener()); } - private void showStreamDialog(final StreamInfoItem item) { - final Context context = getContext(); - if (context == null || context.getResources() == null || getActivity() == null) return; - - final String[] commands = new String[]{ - context.getResources().getString(R.string.enqueue_on_background), - context.getResources().getString(R.string.enqueue_on_popup), - context.getResources().getString(R.string.append_playlist), - context.getResources().getString(R.string.share) - }; - - final DialogInterface.OnClickListener actions = (DialogInterface dialogInterface, int i) -> { - switch (i) { - case 0: - NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item), true); - break; - case 1: - NavigationHelper.enqueueOnPopupPlayer(getActivity(), new SinglePlayQueue(item), true); - break; - case 2: - if (getFragmentManager() != null) { - PlaylistAppendDialog.fromStreamInfoItems(Collections.singletonList(item)) - .show(getFragmentManager(), TAG); - } - break; - case 3: - ShareUtils.shareUrl(this.getContext(), item.getName(), item.getUrl()); - break; - default: - break; - } - }; - - new InfoItemDialog(getActivity(), item, commands, actions).show(); - } - private View.OnTouchListener getOnControlsTouchListener() { return (View view, MotionEvent motionEvent) -> { if (!PreferenceManager.getDefaultSharedPreferences(activity) @@ -1005,7 +964,7 @@ private void setHeightThumbnail() { } private void showContent() { - AnimationUtils.slideUp(contentRootLayoutHiding,120, 96, 0.06f); + contentRootLayoutHiding.setVisibility(View.VISIBLE); } protected void setInitialData(int serviceId, String url, String name) { @@ -1038,9 +997,14 @@ protected void showError(String message, boolean showRetryButton, @DrawableRes i @Override public void showLoading() { + super.showLoading(); - contentRootLayoutHiding.setVisibility(View.INVISIBLE); + //if data is already cached, transition from VISIBLE -> INVISIBLE -> VISIBLE is not required + if(!ExtractorHelper.isCached(serviceId, url, InfoItem.InfoType.STREAM)){ + contentRootLayoutHiding.setVisibility(View.INVISIBLE); + } + animateView(spinnerToolbar, false, 200); animateView(thumbnailPlayButton, false, 50); animateView(detailDurationView, false, 100); diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java index d9c58fbf4e0..d6fd1dd0083 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListFragment.java @@ -2,18 +2,17 @@ import android.app.Activity; import android.content.Context; -import android.content.DialogInterface; import android.content.SharedPreferences; import android.content.res.Configuration; import android.content.res.Resources; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; @@ -25,19 +24,17 @@ import org.schabi.newpipe.extractor.comments.CommentsInfoItem; import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem; import org.schabi.newpipe.extractor.stream.StreamInfoItem; +import org.schabi.newpipe.extractor.stream.StreamType; import org.schabi.newpipe.fragments.BaseStateFragment; import org.schabi.newpipe.fragments.OnScrollBelowItemsListener; import org.schabi.newpipe.info_list.InfoItemDialog; import org.schabi.newpipe.info_list.InfoListAdapter; -import org.schabi.newpipe.local.dialog.PlaylistAppendDialog; -import org.schabi.newpipe.player.playqueue.SinglePlayQueue; import org.schabi.newpipe.report.ErrorActivity; import org.schabi.newpipe.util.NavigationHelper; import org.schabi.newpipe.util.OnClickGesture; -import org.schabi.newpipe.util.ShareUtils; import org.schabi.newpipe.util.StateSaver; +import org.schabi.newpipe.util.StreamDialogEntry; -import java.util.Collections; import java.util.List; import java.util.Queue; @@ -67,7 +64,6 @@ public void onAttach(Context context) { @Override public void onDetach() { - infoListAdapter.dispose(); super.onDetach(); } @@ -100,8 +96,6 @@ public void onResume() { } updateFlags = 0; } - - itemsList.post(infoListAdapter::updateStates); } /*////////////////////////////////////////////////////////////////////////// @@ -258,45 +252,32 @@ protected void onScrollToBottom() { } } + + + protected void showStreamDialog(final StreamInfoItem item) { final Context context = getContext(); final Activity activity = getActivity(); - if (context == null || context.getResources() == null || getActivity() == null) return; - - final String[] commands = new String[]{ - context.getResources().getString(R.string.direct_on_background), - context.getResources().getString(R.string.enqueue_on_background), - context.getResources().getString(R.string.enqueue_on_popup), - context.getResources().getString(R.string.append_playlist), - context.getResources().getString(R.string.share) - }; - - final DialogInterface.OnClickListener actions = (dialogInterface, i) -> { - switch (i) { - case 0: - NavigationHelper.playOnBackgroundPlayer(context, new SinglePlayQueue(item), true); - break; - case 1: - NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item), true); - break; - case 2: - NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(item), true); - break; - case 3: - if (getFragmentManager() != null) { - PlaylistAppendDialog.fromStreamInfoItems(Collections.singletonList(item)) - .show(getFragmentManager(), TAG); - } - break; - case 4: - ShareUtils.shareUrl(this.getContext(), item.getName(), item.getUrl()); - break; - default: - break; - } - }; + if (context == null || context.getResources() == null || activity == null) return; + + if (item.getStreamType() == StreamType.AUDIO_STREAM) { + StreamDialogEntry.setEnabledEntries( + StreamDialogEntry.enqueue_on_background, + StreamDialogEntry.start_here_on_background, + StreamDialogEntry.append_playlist, + StreamDialogEntry.share); + } else { + StreamDialogEntry.setEnabledEntries( + StreamDialogEntry.enqueue_on_background, + StreamDialogEntry.enqueue_on_popup, + StreamDialogEntry.start_here_on_background, + StreamDialogEntry.start_here_on_popup, + StreamDialogEntry.append_playlist, + StreamDialogEntry.share); + } - new InfoItemDialog(getActivity(), item, commands, actions).show(); + new InfoItemDialog(activity, item, StreamDialogEntry.getCommands(context), (dialog, which) -> + StreamDialogEntry.clickOn(which, this, item)).show(); } /*////////////////////////////////////////////////////////////////////////// diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListInfoFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListInfoFragment.java index 5d042c94936..764af271a85 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListInfoFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/BaseListInfoFragment.java @@ -1,11 +1,12 @@ package org.schabi.newpipe.fragments.list; import android.os.Bundle; -import android.support.annotation.NonNull; import android.text.TextUtils; import android.util.Log; import android.view.View; +import androidx.annotation.NonNull; + import org.schabi.newpipe.extractor.ListExtractor; import org.schabi.newpipe.extractor.ListInfo; import org.schabi.newpipe.util.Constants; @@ -61,8 +62,10 @@ public void onResume() { @Override public void onDestroy() { super.onDestroy(); - if (currentWorker != null) currentWorker.dispose(); - currentWorker = null; + if (currentWorker != null) { + currentWorker.dispose(); + currentWorker = null; + } } /*////////////////////////////////////////////////////////////////////////// diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java index 68ee3742ff8..2bf74d85fec 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java @@ -1,17 +1,9 @@ package org.schabi.newpipe.fragments.list.channel; -import android.app.Activity; import android.content.Context; -import android.content.DialogInterface; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.Snackbar; -import android.support.v4.content.ContextCompat; -import android.support.v7.app.ActionBar; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; @@ -25,6 +17,13 @@ import android.widget.LinearLayout; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; +import androidx.core.content.ContextCompat; +import androidx.preference.PreferenceManager; + +import com.google.android.material.snackbar.Snackbar; import com.jakewharton.rxbinding2.view.RxView; import org.schabi.newpipe.R; @@ -37,13 +36,10 @@ import org.schabi.newpipe.extractor.exceptions.ExtractionException; import org.schabi.newpipe.extractor.stream.StreamInfoItem; import org.schabi.newpipe.fragments.list.BaseListInfoFragment; -import org.schabi.newpipe.info_list.InfoItemDialog; -import org.schabi.newpipe.local.dialog.PlaylistAppendDialog; import org.schabi.newpipe.local.subscription.SubscriptionService; import org.schabi.newpipe.notifications.NotificationHelper; import org.schabi.newpipe.player.playqueue.ChannelPlayQueue; import org.schabi.newpipe.player.playqueue.PlayQueue; -import org.schabi.newpipe.player.playqueue.SinglePlayQueue; import org.schabi.newpipe.report.UserAction; import org.schabi.newpipe.util.AnimationUtils; import org.schabi.newpipe.util.ExtractorHelper; @@ -53,7 +49,6 @@ import org.schabi.newpipe.util.ShareUtils; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import java.util.concurrent.TimeUnit; @@ -155,56 +150,6 @@ protected View getListHeader() { return headerRootLayout; } - @Override - protected void showStreamDialog(final StreamInfoItem item) { - final Activity activity = getActivity(); - final Context context = getContext(); - if (context == null || context.getResources() == null || getActivity() == null) return; - - final String[] commands = new String[]{ - context.getResources().getString(R.string.enqueue_on_background), - context.getResources().getString(R.string.enqueue_on_popup), - context.getResources().getString(R.string.start_here_on_main), - context.getResources().getString(R.string.start_here_on_background), - context.getResources().getString(R.string.start_here_on_popup), - context.getResources().getString(R.string.append_playlist), - context.getResources().getString(R.string.share) - }; - - final DialogInterface.OnClickListener actions = (DialogInterface dialogInterface, int i) -> { - final int index = Math.max(infoListAdapter.getItemsList().indexOf(item), 0); - switch (i) { - case 0: - NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item), false); - break; - case 1: - NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(item), false); - break; - case 2: - NavigationHelper.playOnMainPlayer(context, getPlayQueue(index), true); - break; - case 3: - NavigationHelper.playOnBackgroundPlayer(context, getPlayQueue(index), true); - break; - case 4: - NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(index), true); - break; - case 5: - if (getFragmentManager() != null) { - PlaylistAppendDialog.fromStreamInfoItems(Collections.singletonList(item)) - .show(getFragmentManager(), TAG); - } - break; - case 6: - ShareUtils.shareUrl(this.getContext(), item.getName(), item.getUrl()); - break; - default: - break; - } - }; - - new InfoItemDialog(getActivity(), item, commands, actions).show(); - } /*////////////////////////////////////////////////////////////////////////// // Menu //////////////////////////////////////////////////////////////////////////*/ @@ -557,7 +502,7 @@ public void setTitle(String title) { } private boolean isNotificationsEnabled() { - return PreferenceManager.getDefaultSharedPreferences(getContext()) + return PreferenceManager.getDefaultSharedPreferences(requireContext()) .getBoolean(getString(R.string.enable_streams_notifications), false) && NotificationHelper.isNotificationsEnabledNative(getContext()); } diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java index 956e6c1c832..edaf0ec2bf2 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/comments/CommentsFragment.java @@ -2,8 +2,8 @@ import android.content.Context; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -93,7 +93,7 @@ public void showLoading() { public void handleResult(@NonNull CommentsInfo result) { super.handleResult(result); - AnimationUtils.slideUp(getView(),120, 96, 0.06f); + AnimationUtils.slideUp(getView(),120, 150, 0.06f); if (!result.getErrors().isEmpty()) { showSnackBarError(result.getErrors(), UserAction.REQUESTED_COMMENTS, NewPipe.getNameOfService(result.getServiceId()), result.getUrl(), 0); diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java index 7d450069166..6eaa2ea70b8 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java @@ -1,10 +1,9 @@ package org.schabi.newpipe.fragments.list.kiosk; import android.os.Bundle; -import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.app.ActionBar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -155,9 +154,7 @@ public void handleResult(@NonNull final KioskInfo result) { super.handleResult(result); name = kioskTranslatedName; - if(!useAsFrontPage) { - setTitle(kioskTranslatedName); - } + setTitle(kioskTranslatedName); if (!result.getErrors().isEmpty()) { showSnackBarError(result.getErrors(), diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java index 77aa0a25072..32b83bb2252 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java @@ -2,11 +2,10 @@ import android.app.Activity; import android.content.Context; -import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AppCompatActivity; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; @@ -29,18 +28,19 @@ import org.schabi.newpipe.extractor.exceptions.ExtractionException; import org.schabi.newpipe.extractor.playlist.PlaylistInfo; import org.schabi.newpipe.extractor.stream.StreamInfoItem; +import org.schabi.newpipe.extractor.stream.StreamType; import org.schabi.newpipe.fragments.list.BaseListInfoFragment; import org.schabi.newpipe.info_list.InfoItemDialog; import org.schabi.newpipe.local.playlist.RemotePlaylistManager; import org.schabi.newpipe.player.playqueue.PlayQueue; import org.schabi.newpipe.player.playqueue.PlaylistPlayQueue; -import org.schabi.newpipe.player.playqueue.SinglePlayQueue; import org.schabi.newpipe.report.ErrorActivity; import org.schabi.newpipe.report.UserAction; import org.schabi.newpipe.util.ExtractorHelper; import org.schabi.newpipe.util.ImageDisplayConstants; import org.schabi.newpipe.util.NavigationHelper; import org.schabi.newpipe.util.ShareUtils; +import org.schabi.newpipe.util.StreamDialogEntry; import org.schabi.newpipe.util.ThemeHelper; import java.util.ArrayList; @@ -135,48 +135,40 @@ protected void initViews(View rootView, Bundle savedInstanceState) { infoListAdapter.useMiniItemVariants(true); } + private PlayQueue getPlayQueueStartingAt(StreamInfoItem infoItem) { + return getPlayQueue(Math.max(infoListAdapter.getItemsList().indexOf(infoItem), 0)); + } + @Override - protected void showStreamDialog(final StreamInfoItem item) { + protected void showStreamDialog(StreamInfoItem item) { final Context context = getContext(); final Activity activity = getActivity(); - if (context == null || context.getResources() == null || getActivity() == null) return; - - final String[] commands = new String[]{ - context.getResources().getString(R.string.enqueue_on_background), - context.getResources().getString(R.string.enqueue_on_popup), - context.getResources().getString(R.string.start_here_on_main), - context.getResources().getString(R.string.start_here_on_background), - context.getResources().getString(R.string.start_here_on_popup), - context.getResources().getString(R.string.share) - }; + if (context == null || context.getResources() == null || activity == null) return; + + if (item.getStreamType() == StreamType.AUDIO_STREAM) { + StreamDialogEntry.setEnabledEntries( + StreamDialogEntry.enqueue_on_background, + StreamDialogEntry.start_here_on_background, + StreamDialogEntry.append_playlist, + StreamDialogEntry.share); + } else { + StreamDialogEntry.setEnabledEntries( + StreamDialogEntry.enqueue_on_background, + StreamDialogEntry.enqueue_on_popup, + StreamDialogEntry.start_here_on_background, + StreamDialogEntry.start_here_on_popup, + StreamDialogEntry.append_playlist, + StreamDialogEntry.share); + + StreamDialogEntry.start_here_on_popup.setCustomAction( + (fragment, infoItem) -> NavigationHelper.playOnPopupPlayer(context, getPlayQueueStartingAt(infoItem), true)); + } - final DialogInterface.OnClickListener actions = (dialogInterface, i) -> { - final int index = Math.max(infoListAdapter.getItemsList().indexOf(item), 0); - switch (i) { - case 0: - NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(item), false); - break; - case 1: - NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(item), false); - break; - case 2: - NavigationHelper.playOnMainPlayer(context, getPlayQueue(index), true); - break; - case 3: - NavigationHelper.playOnBackgroundPlayer(context, getPlayQueue(index), true); - break; - case 4: - NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(index), true); - break; - case 5: - ShareUtils.shareUrl(requireContext(), item.getName(), item.getUrl()); - break; - default: - break; - } - }; + StreamDialogEntry.start_here_on_background.setCustomAction( + (fragment, infoItem) -> NavigationHelper.playOnBackgroundPlayer(context, getPlayQueueStartingAt(infoItem), true)); - new InfoItemDialog(getActivity(), item, commands, actions).show(); + new InfoItemDialog(activity, item, StreamDialogEntry.getCommands(context), (dialog, which) -> + StreamDialogEntry.clickOn(which, this, item)).show(); } @Override diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java index a3b01f2512e..f2e8aa244e6 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SearchFragment.java @@ -6,13 +6,13 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.TooltipCompat; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AlertDialog; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.TooltipCompat; +import androidx.recyclerview.widget.ItemTouchHelper; import android.text.Editable; import android.text.TextUtils; import android.text.TextWatcher; @@ -73,7 +73,7 @@ import io.reactivex.schedulers.Schedulers; import io.reactivex.subjects.PublishSubject; -import static android.support.v7.widget.helper.ItemTouchHelper.Callback.makeMovementFlags; +import static androidx.recyclerview.widget.ItemTouchHelper.Callback.makeMovementFlags; import static java.util.Arrays.asList; import static org.schabi.newpipe.util.AnimationUtils.animateView; diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java index 3f4e9af0b5c..d46f4bb3111 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/search/SuggestionListAdapter.java @@ -2,8 +2,8 @@ import android.content.Context; import android.content.res.TypedArray; -import android.support.annotation.AttrRes; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.AttrRes; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java b/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java index 69a59c2f1c3..2186efda563 100644 --- a/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java +++ b/app/src/main/java/org/schabi/newpipe/fragments/list/videos/RelatedVideosFragment.java @@ -4,8 +4,8 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; diff --git a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java index 39f7971dd61..2a635bc74ac 100644 --- a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java +++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemBuilder.java @@ -1,15 +1,12 @@ package org.schabi.newpipe.info_list; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.util.Log; +import androidx.annotation.NonNull; import android.view.View; import android.view.ViewGroup; import com.nostra13.universalimageloader.core.ImageLoader; -import org.schabi.newpipe.database.stream.model.StreamStateEntity; import org.schabi.newpipe.extractor.InfoItem; import org.schabi.newpipe.extractor.channel.ChannelInfoItem; import org.schabi.newpipe.extractor.comments.CommentsInfoItem; @@ -24,6 +21,7 @@ import org.schabi.newpipe.info_list.holder.PlaylistMiniInfoItemHolder; import org.schabi.newpipe.info_list.holder.StreamInfoItemHolder; import org.schabi.newpipe.info_list.holder.StreamMiniInfoItemHolder; +import org.schabi.newpipe.local.history.HistoryRecordManager; import org.schabi.newpipe.util.OnClickGesture; /* @@ -61,14 +59,14 @@ public InfoItemBuilder(Context context) { this.context = context; } - public View buildView(@NonNull ViewGroup parent, @NonNull final InfoItem infoItem, @Nullable StreamStateEntity state) { - return buildView(parent, infoItem, state, false); + public View buildView(@NonNull ViewGroup parent, @NonNull final InfoItem infoItem, final HistoryRecordManager historyRecordManager) { + return buildView(parent, infoItem, historyRecordManager, false); } public View buildView(@NonNull ViewGroup parent, @NonNull final InfoItem infoItem, - @Nullable StreamStateEntity state, boolean useMiniVariant) { + final HistoryRecordManager historyRecordManager, boolean useMiniVariant) { InfoItemHolder holder = holderFromInfoType(parent, infoItem.getInfoType(), useMiniVariant); - holder.updateFromItem(infoItem, state); + holder.updateFromItem(infoItem, historyRecordManager); return holder.itemView; } @@ -83,7 +81,6 @@ private InfoItemHolder holderFromInfoType(@NonNull ViewGroup parent, @NonNull In case COMMENT: return useMiniVariant ? new CommentsMiniInfoItemHolder(this, parent) : new CommentsInfoItemHolder(this, parent); default: - Log.e(TAG, "Trollolo"); throw new RuntimeException("InfoType not expected = " + infoType.name()); } } diff --git a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemDialog.java b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemDialog.java index fd0e9f528ce..a7f961e7d47 100644 --- a/app/src/main/java/org/schabi/newpipe/info_list/InfoItemDialog.java +++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoItemDialog.java @@ -3,8 +3,8 @@ import android.app.Activity; import android.app.AlertDialog; import android.content.DialogInterface; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java index 7f5b07dbee6..594ec81af35 100644 --- a/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java +++ b/app/src/main/java/org/schabi/newpipe/info_list/InfoListAdapter.java @@ -1,10 +1,10 @@ package org.schabi.newpipe.info_list; -import android.app.Activity; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import android.content.Context; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.View; import android.view.ViewGroup; @@ -27,6 +27,7 @@ import org.schabi.newpipe.info_list.holder.StreamGridInfoItemHolder; import org.schabi.newpipe.info_list.holder.StreamInfoItemHolder; import org.schabi.newpipe.info_list.holder.StreamMiniInfoItemHolder; +import org.schabi.newpipe.local.history.HistoryRecordManager; import org.schabi.newpipe.util.FallbackViewHolder; import org.schabi.newpipe.util.OnClickGesture; @@ -53,7 +54,7 @@ * along with NewPipe. If not, see . */ -public class InfoListAdapter extends StateObjectsListAdapter { +public class InfoListAdapter extends RecyclerView.Adapter { private static final String TAG = InfoListAdapter.class.getSimpleName(); private static final boolean DEBUG = false; @@ -74,6 +75,8 @@ public class InfoListAdapter extends StateObjectsListAdapter { private final InfoItemBuilder infoItemBuilder; private final ArrayList infoItemList; + private final HistoryRecordManager recordManager; + private boolean useMiniVariant = false; private boolean useGridVariant = false; private boolean showFooter = false; @@ -89,9 +92,9 @@ public HFHolder(View v) { } } - public InfoListAdapter(Activity a) { - super(a.getApplicationContext()); - infoItemBuilder = new InfoItemBuilder(a); + public InfoListAdapter(Context context) { + this.recordManager = new HistoryRecordManager(context); + infoItemBuilder = new InfoItemBuilder(context); infoItemList = new ArrayList<>(); } @@ -120,63 +123,52 @@ public void setGridItemVariants(boolean useGridVariant) { } public void addInfoItemList(@Nullable final List data) { - if (data != null) { - loadStates(data, infoItemList.size(), () -> addInfoItemListImpl(data)); - } - } - - private void addInfoItemListImpl(@NonNull List data) { - if (DEBUG) { - Log.d(TAG, "addInfoItemList() before > infoItemList.size() = " + infoItemList.size() + ", data.size() = " + data.size()); + if (data == null) { + return; } + if (DEBUG) Log.d(TAG, "addInfoItemList() before > infoItemList.size() = " + + infoItemList.size() + ", data.size() = " + data.size()); int offsetStart = sizeConsideringHeaderOffset(); infoItemList.addAll(data); - if (DEBUG) { - Log.d(TAG, "addInfoItemList() after > offsetStart = " + offsetStart + ", infoItemList.size() = " + infoItemList.size() + ", header = " + header + ", footer = " + footer + ", showFooter = " + showFooter); - } - + if (DEBUG) Log.d(TAG, "addInfoItemList() after > offsetStart = " + offsetStart + + ", infoItemList.size() = " + infoItemList.size() + + ", header = " + header + ", footer = " + footer + + ", showFooter = " + showFooter); notifyItemRangeInserted(offsetStart, data.size()); if (footer != null && showFooter) { int footerNow = sizeConsideringHeaderOffset(); notifyItemMoved(offsetStart, footerNow); - if (DEBUG) Log.d(TAG, "addInfoItemList() footer from " + offsetStart + " to " + footerNow); + if (DEBUG) Log.d(TAG, "addInfoItemList() footer from " + offsetStart + + " to " + footerNow); } } public void addInfoItem(@Nullable InfoItem data) { - if (data != null) { - loadState(data, infoItemList.size(), () -> addInfoItemImpl(data)); - } - } - - private void addInfoItemImpl(@NonNull InfoItem data) { - if (DEBUG) { - Log.d(TAG, "addInfoItem() before > infoItemList.size() = " + infoItemList.size() + ", thread = " + Thread.currentThread()); + if (data == null) { + return; } + if (DEBUG) Log.d(TAG, "addInfoItem() before > infoItemList.size() = " + + infoItemList.size() + ", thread = " + Thread.currentThread()); int positionInserted = sizeConsideringHeaderOffset(); infoItemList.add(data); - if (DEBUG) { - Log.d(TAG, "addInfoItem() after > position = " + positionInserted + ", infoItemList.size() = " + infoItemList.size() + ", header = " + header + ", footer = " + footer + ", showFooter = " + showFooter); - } + if (DEBUG) Log.d(TAG, "addInfoItem() after > position = " + positionInserted + + ", infoItemList.size() = " + infoItemList.size() + + ", header = " + header + ", footer = " + footer + + ", showFooter = " + showFooter); notifyItemInserted(positionInserted); if (footer != null && showFooter) { int footerNow = sizeConsideringHeaderOffset(); notifyItemMoved(positionInserted, footerNow); - if (DEBUG) Log.d(TAG, "addInfoItem() footer from " + positionInserted + " to " + footerNow); - } - } - - public void updateStates() { - if (!infoItemList.isEmpty()) { - updateAllStates(infoItemList); + if (DEBUG) Log.d(TAG, "addInfoItem() footer from " + positionInserted + + " to " + footerNow); } } @@ -185,7 +177,6 @@ public void clearStreamItemList() { return; } infoItemList.clear(); - clearStates(); notifyDataSetChanged(); } @@ -254,7 +245,6 @@ public int getItemViewType(int position) { case COMMENT: return useMiniVariant ? MINI_COMMENT_HOLDER_TYPE : COMMENT_HOLDER_TYPE; default: - Log.e(TAG, "Trollolo"); return -1; } } @@ -292,7 +282,6 @@ public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int case COMMENT_HOLDER_TYPE: return new CommentsInfoItemHolder(infoItemBuilder, parent); default: - Log.e(TAG, "Trollolo"); return new FallbackViewHolder(new View(parent.getContext())); } } @@ -304,7 +293,7 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi // If header isn't null, offset the items by -1 if (header != null) position--; - ((InfoItemHolder) holder).updateFromItem(infoItemList.get(position), getState(position)); + ((InfoItemHolder) holder).updateFromItem(infoItemList.get(position), recordManager); } else if (holder instanceof HFHolder && position == 0 && header != null) { ((HFHolder) holder).view = header; } else if (holder instanceof HFHolder && position == sizeConsideringHeaderOffset() && footer != null && showFooter) { @@ -317,11 +306,9 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi if (!payloads.isEmpty() && holder instanceof InfoItemHolder) { for (Object payload : payloads) { if (payload instanceof StreamStateEntity) { - ((InfoItemHolder) holder).updateState(infoItemList.get(header == null ? position : position - 1), - (StreamStateEntity) payload); + ((InfoItemHolder) holder).updateState(infoItemList.get(header == null ? position : position - 1), recordManager); } else if (payload instanceof Boolean) { - ((InfoItemHolder) holder).updateState(infoItemList.get(header == null ? position : position - 1), - null); + ((InfoItemHolder) holder).updateState(infoItemList.get(header == null ? position : position - 1), recordManager); } } } else { @@ -329,11 +316,6 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi } } - @Override - protected void onItemStateChanged(int position, @Nullable StreamStateEntity state) { - notifyItemChanged(header == null ? position : position + 1, state != null ? state : false); - } - public GridLayoutManager.SpanSizeLookup getSpanSizeLookup(final int spanCount) { return new GridLayoutManager.SpanSizeLookup() { @Override diff --git a/app/src/main/java/org/schabi/newpipe/info_list/StateObjectsListAdapter.java b/app/src/main/java/org/schabi/newpipe/info_list/StateObjectsListAdapter.java deleted file mode 100644 index 23ae17bac46..00000000000 --- a/app/src/main/java/org/schabi/newpipe/info_list/StateObjectsListAdapter.java +++ /dev/null @@ -1,189 +0,0 @@ -package org.schabi.newpipe.info_list; - -import android.content.Context; -import android.content.SharedPreferences; -import android.preference.PreferenceManager; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; -import android.util.SparseArray; - -import org.schabi.newpipe.BuildConfig; -import org.schabi.newpipe.R; -import org.schabi.newpipe.database.LocalItem; -import org.schabi.newpipe.database.stream.model.StreamStateEntity; -import org.schabi.newpipe.extractor.InfoItem; -import org.schabi.newpipe.local.history.HistoryRecordManager; -import org.schabi.newpipe.util.SparseArrayUtils; - -import java.util.List; -import java.util.Objects; - -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.CompositeDisposable; - -public abstract class StateObjectsListAdapter extends RecyclerView.Adapter { - - private final SparseArray states; - private final HistoryRecordManager recordManager; - private final CompositeDisposable stateLoaders; - private final Context context; - - public StateObjectsListAdapter(Context context) { - this.states = new SparseArray<>(); - this.recordManager = new HistoryRecordManager(context); - this.context = context; - this.stateLoaders = new CompositeDisposable(); - } - - @Nullable - public StreamStateEntity getState(int position) { - return states.get(position); - } - - protected void clearStates() { - states.clear(); - } - - private void appendStates(List statesEntities, int offset) { - for (int i = 0; i < statesEntities.size(); i++) { - final StreamStateEntity state = statesEntities.get(i); - if (state != null) { - states.append(offset + i, state); - } - } - } - - private void appendState(StreamStateEntity statesEntity, int offset) { - if (statesEntity != null) { - states.append(offset, statesEntity); - } - } - - protected void removeState(int index) { - states.remove(index); - } - - protected void moveState(int from, int to) { - final StreamStateEntity item = states.get(from); - if (from < to) { - SparseArrayUtils.shiftItemsDown(states, from, to); - } else { - SparseArrayUtils.shiftItemsUp(states, to, from); - } - states.put(to, item); - } - - protected void loadStates(List list, int offset, Runnable callback) { - if (isPlaybackStatesVisible()) { - stateLoaders.add( - recordManager.loadStreamStateBatch(list) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(streamStateEntities -> { - appendStates(streamStateEntities, offset); - callback.run(); - }, throwable -> { - if (BuildConfig.DEBUG) throwable.printStackTrace(); - callback.run(); - }) - ); - } else { - callback.run(); - } - } - - protected void loadState(InfoItem item, int offset, Runnable callback) { - if (isPlaybackStatesVisible()) { - stateLoaders.add( - recordManager.loadStreamState(item) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(streamStateEntities -> { - appendState(streamStateEntities[0], offset); - callback.run(); - }, throwable -> { - if (BuildConfig.DEBUG) throwable.printStackTrace(); - callback.run(); - }) - ); - } else { - callback.run(); - } - } - - protected void loadStatesForLocal(List list, int offset, Runnable callback) { - if (isPlaybackStatesVisible()) { - stateLoaders.add( - recordManager.loadLocalStreamStateBatch(list) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(streamStateEntities -> { - appendStates(streamStateEntities, offset); - callback.run(); - }, throwable -> { - if (BuildConfig.DEBUG) throwable.printStackTrace(); - callback.run(); - }) - ); - } else { - callback.run(); - } - } - - private void processStatesUpdates(List streamStateEntities) { - for (int i = 0; i < streamStateEntities.size(); i++) { - final StreamStateEntity newState = streamStateEntities.get(i); - if (!Objects.equals(states.get(i), newState)) { - if (newState == null) { - states.remove(i); - } else { - states.put(i, newState); - } - onItemStateChanged(i, newState); - } - } - } - - protected void updateAllStates(List list) { - if (isPlaybackStatesVisible()) { - stateLoaders.add( - recordManager.loadStreamStateBatch(list) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(this::processStatesUpdates, throwable -> { - if (BuildConfig.DEBUG) throwable.printStackTrace(); - }) - ); - } else { - final int[] positions = SparseArrayUtils.getKeys(states); - states.clear(); - for (int pos : positions) onItemStateChanged(pos, null); - } - } - - protected void updateAllLocalStates(List list) { - if (isPlaybackStatesVisible()) { - stateLoaders.add( - recordManager.loadLocalStreamStateBatch(list) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(this::processStatesUpdates, throwable -> { - if (BuildConfig.DEBUG) throwable.printStackTrace(); - }) - ); - } else { - final int[] positions = SparseArrayUtils.getKeys(states); - states.clear(); - for (int pos : positions) onItemStateChanged(pos, null); - } - } - - public void dispose() { - stateLoaders.dispose(); - } - - protected boolean isPlaybackStatesVisible() { - final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); - return prefs.getBoolean(context.getString(R.string.enable_watch_history_key), true) - && prefs.getBoolean(context.getString(R.string.enable_playback_resume_key), true) - && prefs.getBoolean(context.getString(R.string.enable_playback_state_lists_key), true); - } - - protected abstract void onItemStateChanged(int position, @Nullable StreamStateEntity state); - -} diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelInfoItemHolder.java index 31793445576..956bc47a682 100644 --- a/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelInfoItemHolder.java +++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelInfoItemHolder.java @@ -1,14 +1,13 @@ package org.schabi.newpipe.info_list.holder; -import android.support.annotation.Nullable; import android.view.ViewGroup; import android.widget.TextView; import org.schabi.newpipe.R; -import org.schabi.newpipe.database.stream.model.StreamStateEntity; import org.schabi.newpipe.extractor.InfoItem; import org.schabi.newpipe.extractor.channel.ChannelInfoItem; import org.schabi.newpipe.info_list.InfoItemBuilder; +import org.schabi.newpipe.local.history.HistoryRecordManager; import org.schabi.newpipe.util.Localization; /* @@ -40,8 +39,8 @@ public ChannelInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) } @Override - public void updateFromItem(final InfoItem infoItem, @Nullable final StreamStateEntity state) { - super.updateFromItem(infoItem, state); + public void updateFromItem(final InfoItem infoItem, final HistoryRecordManager historyRecordManager) { + super.updateFromItem(infoItem, historyRecordManager); if (!(infoItem instanceof ChannelInfoItem)) return; final ChannelInfoItem item = (ChannelInfoItem) infoItem; diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java index a191707c0c5..3f4e4e398c3 100644 --- a/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java +++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/ChannelMiniInfoItemHolder.java @@ -1,14 +1,13 @@ package org.schabi.newpipe.info_list.holder; -import android.support.annotation.Nullable; import android.view.ViewGroup; import android.widget.TextView; import org.schabi.newpipe.R; -import org.schabi.newpipe.database.stream.model.StreamStateEntity; import org.schabi.newpipe.extractor.InfoItem; import org.schabi.newpipe.extractor.channel.ChannelInfoItem; import org.schabi.newpipe.info_list.InfoItemBuilder; +import org.schabi.newpipe.local.history.HistoryRecordManager; import org.schabi.newpipe.util.ImageDisplayConstants; import org.schabi.newpipe.util.Localization; @@ -32,7 +31,7 @@ public ChannelMiniInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup pare } @Override - public void updateFromItem(final InfoItem infoItem, @Nullable final StreamStateEntity state) { + public void updateFromItem(final InfoItem infoItem, final HistoryRecordManager historyRecordManager) { if (!(infoItem instanceof ChannelInfoItem)) return; final ChannelInfoItem item = (ChannelInfoItem) infoItem; diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsInfoItemHolder.java index 4ecf8696162..90212ea318a 100644 --- a/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsInfoItemHolder.java +++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsInfoItemHolder.java @@ -1,14 +1,13 @@ package org.schabi.newpipe.info_list.holder; -import android.support.annotation.Nullable; import android.view.ViewGroup; import android.widget.TextView; import org.schabi.newpipe.R; -import org.schabi.newpipe.database.stream.model.StreamStateEntity; import org.schabi.newpipe.extractor.InfoItem; import org.schabi.newpipe.extractor.comments.CommentsInfoItem; import org.schabi.newpipe.info_list.InfoItemBuilder; +import org.schabi.newpipe.local.history.HistoryRecordManager; /* * Created by Christian Schabesberger on 12.02.17. @@ -41,8 +40,8 @@ public CommentsInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) } @Override - public void updateFromItem(final InfoItem infoItem, @Nullable final StreamStateEntity state) { - super.updateFromItem(infoItem, state); + public void updateFromItem(final InfoItem infoItem, final HistoryRecordManager historyRecordManager) { + super.updateFromItem(infoItem, historyRecordManager); if (!(infoItem instanceof CommentsInfoItem)) return; final CommentsInfoItem item = (CommentsInfoItem) infoItem; diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java index 3d3a9bb0976..f2bf5df39b9 100644 --- a/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java +++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/CommentsMiniInfoItemHolder.java @@ -1,18 +1,16 @@ package org.schabi.newpipe.info_list.holder; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import android.text.util.Linkify; -import android.view.View; import android.view.ViewGroup; import android.widget.TextView; import org.jsoup.helper.StringUtil; import org.schabi.newpipe.R; -import org.schabi.newpipe.database.stream.model.StreamStateEntity; import org.schabi.newpipe.extractor.InfoItem; import org.schabi.newpipe.extractor.comments.CommentsInfoItem; import org.schabi.newpipe.info_list.InfoItemBuilder; +import org.schabi.newpipe.local.history.HistoryRecordManager; import org.schabi.newpipe.report.ErrorActivity; import org.schabi.newpipe.util.CommentTextOnTouchListener; import org.schabi.newpipe.util.ImageDisplayConstants; @@ -48,7 +46,7 @@ public String transformUrl(Matcher match, String url) { if(hours != null) timestamp += (Integer.parseInt(hours.replace(":", ""))*3600); if(minutes != null) timestamp += (Integer.parseInt(minutes.replace(":", ""))*60); if(seconds != null) timestamp += (Integer.parseInt(seconds)); - return streamUrl + url.replace(match.group(0), "#timestamp=" + String.valueOf(timestamp)); + return streamUrl + url.replace(match.group(0), "#timestamp=" + timestamp); } }; @@ -67,7 +65,7 @@ public CommentsMiniInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup par } @Override - public void updateFromItem(final InfoItem infoItem, @Nullable final StreamStateEntity state) { + public void updateFromItem(final InfoItem infoItem, final HistoryRecordManager historyRecordManager) { if (!(infoItem instanceof CommentsInfoItem)) return; final CommentsInfoItem item = (CommentsInfoItem) infoItem; @@ -76,20 +74,17 @@ public void updateFromItem(final InfoItem infoItem, @Nullable final StreamStateE itemThumbnailView, ImageDisplayConstants.DISPLAY_THUMBNAIL_OPTIONS); - itemThumbnailView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - if(StringUtil.isBlank(item.getAuthorEndpoint())) return; - try { - final AppCompatActivity activity = (AppCompatActivity) itemBuilder.getContext(); - NavigationHelper.openChannelFragment( - activity.getSupportFragmentManager(), - item.getServiceId(), - item.getAuthorEndpoint(), - item.getAuthorName()); - } catch (Exception e) { - ErrorActivity.reportUiError((AppCompatActivity) itemBuilder.getContext(), e); - } + itemThumbnailView.setOnClickListener(view -> { + if(StringUtil.isBlank(item.getAuthorEndpoint())) return; + try { + final AppCompatActivity activity = (AppCompatActivity) itemBuilder.getContext(); + NavigationHelper.openChannelFragment( + activity.getSupportFragmentManager(), + item.getServiceId(), + item.getAuthorEndpoint(), + item.getAuthorName()); + } catch (Exception e) { + ErrorActivity.reportUiError((AppCompatActivity) itemBuilder.getContext(), e); } }); @@ -101,7 +96,7 @@ public void onClick(View view) { itemContentView.setOnTouchListener(CommentTextOnTouchListener.INSTANCE); if (itemContentView.getLineCount() == 0) { - itemContentView.post(() -> ellipsize()); + itemContentView.post(this::ellipsize); } else { ellipsize(); } diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/InfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/InfoItemHolder.java index 3bc0d9e54ad..1b97e2d27b2 100644 --- a/app/src/main/java/org/schabi/newpipe/info_list/holder/InfoItemHolder.java +++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/InfoItemHolder.java @@ -1,13 +1,12 @@ package org.schabi.newpipe.info_list.holder; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; -import org.schabi.newpipe.database.stream.model.StreamStateEntity; import org.schabi.newpipe.extractor.InfoItem; import org.schabi.newpipe.info_list.InfoItemBuilder; +import org.schabi.newpipe.local.history.HistoryRecordManager; /* * Created by Christian Schabesberger on 12.02.17. @@ -37,8 +36,8 @@ public InfoItemHolder(InfoItemBuilder infoItemBuilder, int layoutId, ViewGroup p this.itemBuilder = infoItemBuilder; } - public abstract void updateFromItem(final InfoItem infoItem, @Nullable final StreamStateEntity state); + public abstract void updateFromItem(final InfoItem infoItem, final HistoryRecordManager historyRecordManager); - public void updateState(final InfoItem infoItem, @Nullable final StreamStateEntity state) { + public void updateState(final InfoItem infoItem, final HistoryRecordManager historyRecordManager) { } } diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistMiniInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistMiniInfoItemHolder.java index f9d617e6696..b73f22d93a7 100644 --- a/app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistMiniInfoItemHolder.java +++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/PlaylistMiniInfoItemHolder.java @@ -1,15 +1,14 @@ package org.schabi.newpipe.info_list.holder; -import android.support.annotation.Nullable; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; import org.schabi.newpipe.R; -import org.schabi.newpipe.database.stream.model.StreamStateEntity; import org.schabi.newpipe.extractor.InfoItem; import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem; import org.schabi.newpipe.info_list.InfoItemBuilder; +import org.schabi.newpipe.local.history.HistoryRecordManager; import org.schabi.newpipe.util.ImageDisplayConstants; public class PlaylistMiniInfoItemHolder extends InfoItemHolder { @@ -32,7 +31,7 @@ public PlaylistMiniInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup par } @Override - public void updateFromItem(final InfoItem infoItem, @Nullable final StreamStateEntity state) { + public void updateFromItem(final InfoItem infoItem, final HistoryRecordManager historyRecordManager) { if (!(infoItem instanceof PlaylistInfoItem)) return; final PlaylistInfoItem item = (PlaylistInfoItem) infoItem; diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamInfoItemHolder.java index 25502bc81ed..ea058bc0e30 100644 --- a/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamInfoItemHolder.java +++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamInfoItemHolder.java @@ -1,15 +1,14 @@ package org.schabi.newpipe.info_list.holder; -import android.support.annotation.Nullable; import android.text.TextUtils; import android.view.ViewGroup; import android.widget.TextView; import org.schabi.newpipe.R; -import org.schabi.newpipe.database.stream.model.StreamStateEntity; import org.schabi.newpipe.extractor.InfoItem; import org.schabi.newpipe.extractor.stream.StreamInfoItem; import org.schabi.newpipe.info_list.InfoItemBuilder; +import org.schabi.newpipe.local.history.HistoryRecordManager; import org.schabi.newpipe.util.Localization; /* @@ -42,8 +41,8 @@ public StreamInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup parent) { } @Override - public void updateFromItem(final InfoItem infoItem, @Nullable final StreamStateEntity state) { - super.updateFromItem(infoItem, state); + public void updateFromItem(final InfoItem infoItem, final HistoryRecordManager historyRecordManager) { + super.updateFromItem(infoItem, historyRecordManager); if (!(infoItem instanceof StreamInfoItem)) return; final StreamInfoItem item = (StreamInfoItem) infoItem; diff --git a/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java index aa2a3f8786c..6173e53f9e4 100644 --- a/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java +++ b/app/src/main/java/org/schabi/newpipe/info_list/holder/StreamMiniInfoItemHolder.java @@ -1,7 +1,6 @@ package org.schabi.newpipe.info_list.holder; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; @@ -13,6 +12,7 @@ import org.schabi.newpipe.extractor.stream.StreamInfoItem; import org.schabi.newpipe.extractor.stream.StreamType; import org.schabi.newpipe.info_list.InfoItemBuilder; +import org.schabi.newpipe.local.history.HistoryRecordManager; import org.schabi.newpipe.util.AnimationUtils; import org.schabi.newpipe.util.ImageDisplayConstants; import org.schabi.newpipe.util.Localization; @@ -43,7 +43,7 @@ public StreamMiniInfoItemHolder(InfoItemBuilder infoItemBuilder, ViewGroup paren } @Override - public void updateFromItem(final InfoItem infoItem, @Nullable final StreamStateEntity state) { + public void updateFromItem(final InfoItem infoItem, final HistoryRecordManager historyRecordManager) { if (!(infoItem instanceof StreamInfoItem)) return; final StreamInfoItem item = (StreamInfoItem) infoItem; @@ -55,10 +55,12 @@ public void updateFromItem(final InfoItem infoItem, @Nullable final StreamStateE itemDurationView.setBackgroundColor(ContextCompat.getColor(itemBuilder.getContext(), R.color.duration_background_color)); itemDurationView.setVisibility(View.VISIBLE); - if (state != null) { + + StreamStateEntity state2 = historyRecordManager.loadStreamState(infoItem).blockingGet()[0]; + if (state2 != null) { itemProgressView.setVisibility(View.VISIBLE); itemProgressView.setMax((int) item.getDuration()); - itemProgressView.setProgress((int) TimeUnit.MILLISECONDS.toSeconds(state.getProgressTime())); + itemProgressView.setProgress((int) TimeUnit.MILLISECONDS.toSeconds(state2.getProgressTime())); } else { itemProgressView.setVisibility(View.GONE); } @@ -101,8 +103,10 @@ public void updateFromItem(final InfoItem infoItem, @Nullable final StreamStateE } @Override - public void updateState(final InfoItem infoItem, @Nullable final StreamStateEntity state) { + public void updateState(final InfoItem infoItem, final HistoryRecordManager historyRecordManager) { final StreamInfoItem item = (StreamInfoItem) infoItem; + + StreamStateEntity state = historyRecordManager.loadStreamState(infoItem).blockingGet()[0]; if (state != null && item.getDuration() > 0 && item.getStreamType() != StreamType.LIVE_STREAM) { itemProgressView.setMax((int) item.getDuration()); if (itemProgressView.getVisibility() == View.VISIBLE) { @@ -130,4 +134,4 @@ private void disableLongClick() { itemView.setLongClickable(false); itemView.setOnLongClickListener(null); } -} +} \ No newline at end of file diff --git a/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java b/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java index 94672bd49ac..414a9b6b59b 100644 --- a/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java +++ b/app/src/main/java/org/schabi/newpipe/local/BaseLocalListFragment.java @@ -5,11 +5,11 @@ import android.content.res.Resources; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.v4.app.Fragment; -import android.support.v7.app.ActionBar; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.ActionBar; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; @@ -76,8 +76,6 @@ public void onResume() { } updateFlags = 0; } - - itemsList.post(itemListAdapter::updateStates); } /*////////////////////////////////////////////////////////////////////////// @@ -152,7 +150,6 @@ public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) { public void onDestroyView() { super.onDestroyView(); itemsList = null; - itemListAdapter.dispose(); itemListAdapter = null; } diff --git a/app/src/main/java/org/schabi/newpipe/local/HeaderFooterHolder.java b/app/src/main/java/org/schabi/newpipe/local/HeaderFooterHolder.java index 49a552b3e9d..9ee33b3c4a4 100644 --- a/app/src/main/java/org/schabi/newpipe/local/HeaderFooterHolder.java +++ b/app/src/main/java/org/schabi/newpipe/local/HeaderFooterHolder.java @@ -1,6 +1,6 @@ package org.schabi.newpipe.local; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; public class HeaderFooterHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java b/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java index d29e85ee324..89c1267c863 100644 --- a/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java +++ b/app/src/main/java/org/schabi/newpipe/local/LocalItemListAdapter.java @@ -1,17 +1,17 @@ package org.schabi.newpipe.local; -import android.app.Activity; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.RecyclerView; +import android.content.Context; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.View; import android.view.ViewGroup; import org.schabi.newpipe.database.LocalItem; import org.schabi.newpipe.database.stream.model.StreamStateEntity; -import org.schabi.newpipe.info_list.StateObjectsListAdapter; +import org.schabi.newpipe.local.history.HistoryRecordManager; import org.schabi.newpipe.local.holder.LocalItemHolder; import org.schabi.newpipe.local.holder.LocalPlaylistGridItemHolder; import org.schabi.newpipe.local.holder.LocalPlaylistItemHolder; @@ -49,7 +49,7 @@ * along with NewPipe. If not, see . */ -public class LocalItemListAdapter extends StateObjectsListAdapter { +public class LocalItemListAdapter extends RecyclerView.Adapter { private static final String TAG = LocalItemListAdapter.class.getSimpleName(); private static final boolean DEBUG = false; @@ -68,6 +68,7 @@ public class LocalItemListAdapter extends StateObjectsListAdapter { private final LocalItemBuilder localItemBuilder; private final ArrayList localItems; + private final HistoryRecordManager recordManager; private final DateFormat dateFormat; private boolean showFooter = false; @@ -75,12 +76,12 @@ public class LocalItemListAdapter extends StateObjectsListAdapter { private View header = null; private View footer = null; - public LocalItemListAdapter(Activity activity) { - super(activity.getApplicationContext()); - localItemBuilder = new LocalItemBuilder(activity); + public LocalItemListAdapter(Context context) { + recordManager = new HistoryRecordManager(context); + localItemBuilder = new LocalItemBuilder(context); localItems = new ArrayList<>(); dateFormat = DateFormat.getDateInstance(DateFormat.SHORT, - Localization.getPreferredLocale(activity)); + Localization.getPreferredLocale(context)); } public void setSelectedListener(OnClickGesture listener) { @@ -92,27 +93,19 @@ public void unsetSelectedListener() { } public void addItems(@Nullable List data) { - if (data != null) { - loadStatesForLocal(data, localItems.size(), () -> addItemsImpl(data)); - } - } - - private void addItemsImpl(@NonNull List data) { - if (DEBUG) { - Log.d(TAG, "addItems() before > localItems.size() = " + - localItems.size() + ", data.size() = " + data.size()); + if (data == null) { + return; } + if (DEBUG) Log.d(TAG, "addItems() before > localItems.size() = " + + localItems.size() + ", data.size() = " + data.size()); int offsetStart = sizeConsideringHeader(); localItems.addAll(data); - if (DEBUG) { - Log.d(TAG, "addItems() after > offsetStart = " + offsetStart + - ", localItems.size() = " + localItems.size() + - ", header = " + header + ", footer = " + footer + - ", showFooter = " + showFooter); - } - + if (DEBUG) Log.d(TAG, "addItems() after > offsetStart = " + offsetStart + + ", localItems.size() = " + localItems.size() + + ", header = " + header + ", footer = " + footer + + ", showFooter = " + showFooter); notifyItemRangeInserted(offsetStart, data.size()); if (footer != null && showFooter) { @@ -124,16 +117,9 @@ private void addItemsImpl(@NonNull List data) { } } - public void updateStates() { - if (!localItems.isEmpty()) { - updateAllLocalStates(localItems); - } - } - public void removeItem(final LocalItem data) { final int index = localItems.indexOf(data); localItems.remove(index); - removeState(index); notifyItemRemoved(index + (header != null ? 1 : 0)); } @@ -145,7 +131,6 @@ public boolean swapItems(int fromAdapterPosition, int toAdapterPosition) { if (actualFrom >= localItems.size() || actualTo >= localItems.size()) return false; localItems.add(actualTo, localItems.remove(actualFrom)); - moveState(actualFrom, actualTo); notifyItemMoved(fromAdapterPosition, toAdapterPosition); return true; } @@ -155,7 +140,6 @@ public void clearStreamItemList() { return; } localItems.clear(); - clearStates(); notifyDataSetChanged(); } @@ -236,8 +220,9 @@ public int getItemViewType(int position) { } } + @NonNull @Override - public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int type) { + public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int type) { if (DEBUG) Log.d(TAG, "onCreateViewHolder() called with: parent = [" + parent + "], type = [" + type + "]"); switch (type) { @@ -268,7 +253,7 @@ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int type) { } @Override - public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { + public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) { if (DEBUG) Log.d(TAG, "onBindViewHolder() called with: holder = [" + holder.getClass().getSimpleName() + "], position = [" + position + "]"); @@ -276,7 +261,7 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) { // If header isn't null, offset the items by -1 if (header != null) position--; - ((LocalItemHolder) holder).updateFromItem(localItems.get(position), getState(position), dateFormat); + ((LocalItemHolder) holder).updateFromItem(localItems.get(position), recordManager, dateFormat); } else if (holder instanceof HeaderFooterHolder && position == 0 && header != null) { ((HeaderFooterHolder) holder).view = header; } else if (holder instanceof HeaderFooterHolder && position == sizeConsideringHeader() @@ -290,11 +275,9 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi if (!payloads.isEmpty() && holder instanceof LocalItemHolder) { for (Object payload : payloads) { if (payload instanceof StreamStateEntity) { - ((LocalItemHolder) holder).updateState(localItems.get(header == null ? position : position - 1), - (StreamStateEntity) payload); + ((LocalItemHolder) holder).updateState(localItems.get(header == null ? position : position - 1), recordManager); } else if (payload instanceof Boolean) { - ((LocalItemHolder) holder).updateState(localItems.get(header == null ? position : position - 1), - null); + ((LocalItemHolder) holder).updateState(localItems.get(header == null ? position : position - 1), recordManager); } } } else { @@ -302,11 +285,6 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi } } - @Override - protected void onItemStateChanged(int position, @Nullable StreamStateEntity state) { - notifyItemChanged(header == null ? position : position + 1, state != null ? state : false); - } - public GridLayoutManager.SpanSizeLookup getSpanSizeLookup(final int spanCount) { return new GridLayoutManager.SpanSizeLookup() { @Override diff --git a/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java b/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java index 99bd70f5bed..8f67367aaf0 100644 --- a/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java +++ b/app/src/main/java/org/schabi/newpipe/local/bookmark/BookmarkFragment.java @@ -3,9 +3,9 @@ import android.app.AlertDialog; import android.os.Bundle; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.FragmentManager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.FragmentManager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java index 5973ad920d0..ac02b0b3740 100644 --- a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java +++ b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistAppendDialog.java @@ -1,11 +1,10 @@ package org.schabi.newpipe.local.dialog; -import android.annotation.SuppressLint; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -28,7 +27,7 @@ import java.util.List; import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.disposables.Disposable; +import io.reactivex.disposables.CompositeDisposable; public final class PlaylistAppendDialog extends PlaylistDialog { private static final String TAG = PlaylistAppendDialog.class.getCanonicalName(); @@ -36,7 +35,7 @@ public final class PlaylistAppendDialog extends PlaylistDialog { private RecyclerView playlistRecyclerView; private LocalItemListAdapter playlistAdapter; - private Disposable playlistReactor; + private CompositeDisposable playlistDisposables = new CompositeDisposable(); public static PlaylistAppendDialog fromStreamInfo(final StreamInfo info) { PlaylistAppendDialog dialog = new PlaylistAppendDialog(); @@ -99,9 +98,9 @@ public void selected(LocalItem selectedItem) { final View newPlaylistButton = view.findViewById(R.id.newPlaylist); newPlaylistButton.setOnClickListener(ignored -> openCreatePlaylistDialog()); - playlistReactor = playlistManager.getPlaylists() + playlistDisposables.add(playlistManager.getPlaylists() .observeOn(AndroidSchedulers.mainThread()) - .subscribe(this::onPlaylistsReceived); + .subscribe(this::onPlaylistsReceived)); } /*////////////////////////////////////////////////////////////////////////// @@ -111,13 +110,12 @@ public void selected(LocalItem selectedItem) { @Override public void onDestroyView() { super.onDestroyView(); - if (playlistReactor != null) playlistReactor.dispose(); + playlistDisposables.dispose(); if (playlistAdapter != null) { - playlistAdapter.dispose(); playlistAdapter.unsetSelectedListener(); } - playlistReactor = null; + playlistDisposables.clear(); playlistRecyclerView = null; playlistAdapter = null; } @@ -151,13 +149,12 @@ private void onPlaylistSelected(@NonNull LocalPlaylistManager manager, @NonNull List streams) { if (getStreams() == null) return; - @SuppressLint("ShowToast") final Toast successToast = Toast.makeText(getContext(), R.string.playlist_add_stream_success, Toast.LENGTH_SHORT); - manager.appendToPlaylist(playlist.uid, streams) + playlistDisposables.add(manager.appendToPlaylist(playlist.uid, streams) .observeOn(AndroidSchedulers.mainThread()) - .subscribe(ignored -> successToast.show()); + .subscribe(ignored -> successToast.show())); getDialog().dismiss(); } diff --git a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java index ddbe653990a..0507d3dd0dc 100644 --- a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java +++ b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistCreationDialog.java @@ -3,8 +3,8 @@ import android.app.AlertDialog; import android.app.Dialog; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.View; import android.widget.EditText; import android.widget.Toast; diff --git a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistDialog.java b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistDialog.java index df98fb3eb6e..12e57808e8c 100644 --- a/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistDialog.java +++ b/app/src/main/java/org/schabi/newpipe/local/dialog/PlaylistDialog.java @@ -2,9 +2,9 @@ import android.app.Dialog; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; import android.view.Window; import org.schabi.newpipe.database.stream.model.StreamEntity; diff --git a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.java b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.java index 475627c081f..04406c3da34 100644 --- a/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.java +++ b/app/src/main/java/org/schabi/newpipe/local/feed/FeedFragment.java @@ -2,9 +2,9 @@ import android.os.Bundle; import android.os.Handler; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.app.ActionBar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; @@ -183,7 +183,7 @@ public void startLoading(boolean forceLoad) { } @Override - public void handleResult(@android.support.annotation.NonNull List result) { + public void handleResult(@androidx.annotation.NonNull List result) { super.handleResult(result); if (result.isEmpty()) { diff --git a/app/src/main/java/org/schabi/newpipe/local/history/HistoryEntryAdapter.java b/app/src/main/java/org/schabi/newpipe/local/history/HistoryEntryAdapter.java index 09549346b22..c4ca08a0a48 100644 --- a/app/src/main/java/org/schabi/newpipe/local/history/HistoryEntryAdapter.java +++ b/app/src/main/java/org/schabi/newpipe/local/history/HistoryEntryAdapter.java @@ -1,9 +1,9 @@ package org.schabi.newpipe.local.history; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.RecyclerView; import org.schabi.newpipe.util.Localization; diff --git a/app/src/main/java/org/schabi/newpipe/local/history/HistoryListener.java b/app/src/main/java/org/schabi/newpipe/local/history/HistoryListener.java index 6e4b8571390..fc039f770e1 100644 --- a/app/src/main/java/org/schabi/newpipe/local/history/HistoryListener.java +++ b/app/src/main/java/org/schabi/newpipe/local/history/HistoryListener.java @@ -1,6 +1,6 @@ package org.schabi.newpipe.local.history; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import org.schabi.newpipe.extractor.stream.AudioStream; import org.schabi.newpipe.extractor.stream.StreamInfo; diff --git a/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java b/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java index dd2d67e4375..d84fe019599 100644 --- a/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java +++ b/app/src/main/java/org/schabi/newpipe/local/history/HistoryRecordManager.java @@ -21,7 +21,7 @@ import android.content.Context; import android.content.SharedPreferences; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.schabi.newpipe.NewPipeDatabase; import org.schabi.newpipe.R; @@ -109,6 +109,11 @@ public Single deleteWholeStreamHistory() { .subscribeOn(Schedulers.io()); } + public Single deleteCompelteStreamStateHistory() { + return Single.fromCallable(streamStateTable::deleteAll) + .subscribeOn(Schedulers.io()); + } + public Flowable> getStreamHistory() { return streamHistoryTable.getHistory().subscribeOn(Schedulers.io()); } @@ -165,7 +170,7 @@ public Single deleteSearchHistory(final String search) { .subscribeOn(Schedulers.io()); } - public Single deleteWholeSearchHistory() { + public Single deleteCompleteSearchHistory() { return Single.fromCallable(searchHistoryTable::deleteAll) .subscribeOn(Schedulers.io()); } @@ -291,4 +296,5 @@ public Single> loadLocalStreamStateBatch(final List removeOrphanedRecords() { return Single.fromCallable(streamTable::deleteOrphans).subscribeOn(Schedulers.io()); } + } diff --git a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java index b97fdf8f21a..31ae70954e2 100644 --- a/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java +++ b/app/src/main/java/org/schabi/newpipe/local/history/StatisticsPlaylistFragment.java @@ -2,13 +2,12 @@ import android.app.Activity; import android.content.Context; -import android.content.DialogInterface; import android.os.Bundle; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.Snackbar; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.snackbar.Snackbar; +import androidx.appcompat.app.AlertDialog; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -25,6 +24,7 @@ import org.schabi.newpipe.database.LocalItem; import org.schabi.newpipe.database.stream.StreamStatisticsEntry; import org.schabi.newpipe.extractor.stream.StreamInfoItem; +import org.schabi.newpipe.extractor.stream.StreamType; import org.schabi.newpipe.info_list.InfoItemDialog; import org.schabi.newpipe.local.BaseLocalListFragment; import org.schabi.newpipe.player.playqueue.PlayQueue; @@ -34,7 +34,7 @@ import org.schabi.newpipe.settings.SettingsActivity; import org.schabi.newpipe.util.NavigationHelper; import org.schabi.newpipe.util.OnClickGesture; -import org.schabi.newpipe.util.ShareUtils; +import org.schabi.newpipe.util.StreamDialogEntry; import org.schabi.newpipe.util.ThemeHelper; import java.util.ArrayList; @@ -180,7 +180,7 @@ public boolean onOptionsItemSelected(MenuItem item) { .observeOn(AndroidSchedulers.mainThread()) .subscribe( howManyDeleted -> Toast.makeText(getContext(), - R.string.view_history_deleted, + R.string.watch_history_deleted, Toast.LENGTH_SHORT).show(), throwable -> ErrorActivity.reportError(getContext(), throwable, @@ -357,52 +357,44 @@ private void toggleSortMode() { startLoading(true); } + private PlayQueue getPlayQueueStartingAt(StreamStatisticsEntry infoItem) { + return getPlayQueue(Math.max(itemListAdapter.getItemsList().indexOf(infoItem), 0)); + } + private void showStreamDialog(final StreamStatisticsEntry item) { final Context context = getContext(); final Activity activity = getActivity(); - if (context == null || context.getResources() == null || getActivity() == null) return; + if (context == null || context.getResources() == null || activity == null) return; final StreamInfoItem infoItem = item.toStreamInfoItem(); - final String[] commands = new String[]{ - context.getResources().getString(R.string.enqueue_on_background), - context.getResources().getString(R.string.enqueue_on_popup), - context.getResources().getString(R.string.start_here_on_main), - context.getResources().getString(R.string.start_here_on_background), - context.getResources().getString(R.string.start_here_on_popup), - context.getResources().getString(R.string.delete), - context.getResources().getString(R.string.share) - }; + if (infoItem.getStreamType() == StreamType.AUDIO_STREAM) { + StreamDialogEntry.setEnabledEntries( + StreamDialogEntry.enqueue_on_background, + StreamDialogEntry.start_here_on_background, + StreamDialogEntry.delete, + StreamDialogEntry.append_playlist, + StreamDialogEntry.share); + } else { + StreamDialogEntry.setEnabledEntries( + StreamDialogEntry.enqueue_on_background, + StreamDialogEntry.enqueue_on_popup, + StreamDialogEntry.start_here_on_background, + StreamDialogEntry.start_here_on_popup, + StreamDialogEntry.delete, + StreamDialogEntry.append_playlist, + StreamDialogEntry.share); + + StreamDialogEntry.start_here_on_popup.setCustomAction( + (fragment, infoItemDuplicate) -> NavigationHelper.playOnPopupPlayer(context, getPlayQueueStartingAt(item), true)); + } - final DialogInterface.OnClickListener actions = (dialogInterface, i) -> { - final int index = Math.max(itemListAdapter.getItemsList().indexOf(item), 0); - switch (i) { - case 0: - NavigationHelper.enqueueOnBackgroundPlayer(context, new SinglePlayQueue(infoItem), false); - break; - case 1: - NavigationHelper.enqueueOnPopupPlayer(activity, new SinglePlayQueue(infoItem), false); - break; - case 2: - NavigationHelper.playOnMainPlayer(context, getPlayQueue(index), true); - break; - case 3: - NavigationHelper.playOnBackgroundPlayer(context, getPlayQueue(index), true); - break; - case 4: - NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(index), true); - break; - case 5: - deleteEntry(index); - break; - case 6: - ShareUtils.shareUrl(this.getContext(), item.toStreamInfoItem().getName(), item.toStreamInfoItem().getUrl()); - break; - default: - break; - } - }; + StreamDialogEntry.start_here_on_background.setCustomAction( + (fragment, infoItemDuplicate) -> NavigationHelper.playOnBackgroundPlayer(context, getPlayQueueStartingAt(item), true)); + StreamDialogEntry.delete.setCustomAction((fragment, infoItemDuplicate) -> + deleteEntry(Math.max(itemListAdapter.getItemsList().indexOf(item), 0))); - new InfoItemDialog(getActivity(), infoItem, commands, actions).show(); + new InfoItemDialog(activity, infoItem, StreamDialogEntry.getCommands(context), (dialog, which) -> + StreamDialogEntry.clickOn(which, this, infoItem)).show(); } private void deleteEntry(final int index) { diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/LocalItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/LocalItemHolder.java index c00fa1fb4b1..f9da969a5e8 100644 --- a/app/src/main/java/org/schabi/newpipe/local/holder/LocalItemHolder.java +++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalItemHolder.java @@ -1,13 +1,12 @@ package org.schabi.newpipe.local.holder; -import android.support.annotation.Nullable; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.ViewGroup; import org.schabi.newpipe.database.LocalItem; -import org.schabi.newpipe.database.stream.model.StreamStateEntity; import org.schabi.newpipe.local.LocalItemBuilder; +import org.schabi.newpipe.local.history.HistoryRecordManager; import java.text.DateFormat; @@ -40,8 +39,8 @@ public LocalItemHolder(LocalItemBuilder itemBuilder, int layoutId, ViewGroup par this.itemBuilder = itemBuilder; } - public abstract void updateFromItem(final LocalItem item, @Nullable final StreamStateEntity state, final DateFormat dateFormat); + public abstract void updateFromItem(final LocalItem item, HistoryRecordManager historyRecordManager, final DateFormat dateFormat); - public void updateState(final LocalItem localItem, @Nullable final StreamStateEntity state) { + public void updateState(final LocalItem localItem, HistoryRecordManager historyRecordManager) { } } diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistItemHolder.java index 0e6eca9ba3f..1366bd02e93 100644 --- a/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistItemHolder.java +++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistItemHolder.java @@ -1,13 +1,12 @@ package org.schabi.newpipe.local.holder; -import android.support.annotation.Nullable; import android.view.View; import android.view.ViewGroup; import org.schabi.newpipe.database.LocalItem; import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry; -import org.schabi.newpipe.database.stream.model.StreamStateEntity; import org.schabi.newpipe.local.LocalItemBuilder; +import org.schabi.newpipe.local.history.HistoryRecordManager; import org.schabi.newpipe.util.ImageDisplayConstants; import java.text.DateFormat; @@ -23,7 +22,7 @@ public LocalPlaylistItemHolder(LocalItemBuilder infoItemBuilder, ViewGroup paren } @Override - public void updateFromItem(final LocalItem localItem, @Nullable final StreamStateEntity state, final DateFormat dateFormat) { + public void updateFromItem(final LocalItem localItem, HistoryRecordManager historyRecordManager, final DateFormat dateFormat) { if (!(localItem instanceof PlaylistMetadataEntry)) return; final PlaylistMetadataEntry item = (PlaylistMetadataEntry) localItem; @@ -34,6 +33,6 @@ public void updateFromItem(final LocalItem localItem, @Nullable final StreamStat itemBuilder.displayImage(item.thumbnailUrl, itemThumbnailView, ImageDisplayConstants.DISPLAY_PLAYLIST_OPTIONS); - super.updateFromItem(localItem, state, dateFormat); + super.updateFromItem(localItem, historyRecordManager, dateFormat); } } diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamItemHolder.java index 0c4e66c9d2a..30cc6de32fa 100644 --- a/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamItemHolder.java +++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalPlaylistStreamItemHolder.java @@ -1,7 +1,6 @@ package org.schabi.newpipe.local.holder; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; +import androidx.core.content.ContextCompat; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; @@ -14,12 +13,14 @@ import org.schabi.newpipe.database.stream.model.StreamStateEntity; import org.schabi.newpipe.extractor.NewPipe; import org.schabi.newpipe.local.LocalItemBuilder; +import org.schabi.newpipe.local.history.HistoryRecordManager; import org.schabi.newpipe.util.AnimationUtils; import org.schabi.newpipe.util.ImageDisplayConstants; import org.schabi.newpipe.util.Localization; import org.schabi.newpipe.views.AnimatedProgressBar; import java.text.DateFormat; +import java.util.ArrayList; import java.util.concurrent.TimeUnit; public class LocalPlaylistStreamItemHolder extends LocalItemHolder { @@ -47,7 +48,7 @@ public LocalPlaylistStreamItemHolder(LocalItemBuilder infoItemBuilder, ViewGroup } @Override - public void updateFromItem(final LocalItem localItem, @Nullable final StreamStateEntity state, final DateFormat dateFormat) { + public void updateFromItem(final LocalItem localItem, HistoryRecordManager historyRecordManager, final DateFormat dateFormat) { if (!(localItem instanceof PlaylistStreamEntry)) return; final PlaylistStreamEntry item = (PlaylistStreamEntry) localItem; @@ -60,6 +61,8 @@ public void updateFromItem(final LocalItem localItem, @Nullable final StreamStat itemDurationView.setBackgroundColor(ContextCompat.getColor(itemBuilder.getContext(), R.color.duration_background_color)); itemDurationView.setVisibility(View.VISIBLE); + + StreamStateEntity state = historyRecordManager.loadLocalStreamStateBatch(new ArrayList() {{ add(localItem); }}).blockingGet().get(0); if (state != null) { itemProgressView.setVisibility(View.VISIBLE); itemProgressView.setMax((int) item.duration); @@ -94,9 +97,11 @@ public void updateFromItem(final LocalItem localItem, @Nullable final StreamStat } @Override - public void updateState(LocalItem localItem, @Nullable StreamStateEntity state) { + public void updateState(LocalItem localItem, HistoryRecordManager historyRecordManager) { if (!(localItem instanceof PlaylistStreamEntry)) return; final PlaylistStreamEntry item = (PlaylistStreamEntry) localItem; + + StreamStateEntity state = historyRecordManager.loadLocalStreamStateBatch(new ArrayList() {{ add(localItem); }}).blockingGet().get(0); if (state != null && item.duration > 0) { itemProgressView.setMax((int) item.duration); if (itemProgressView.getVisibility() == View.VISIBLE) { diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java index b24051a4f3a..75fbf13ea46 100644 --- a/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java +++ b/app/src/main/java/org/schabi/newpipe/local/holder/LocalStatisticStreamItemHolder.java @@ -1,7 +1,7 @@ package org.schabi.newpipe.local.holder; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; @@ -13,12 +13,14 @@ import org.schabi.newpipe.database.stream.model.StreamStateEntity; import org.schabi.newpipe.extractor.NewPipe; import org.schabi.newpipe.local.LocalItemBuilder; +import org.schabi.newpipe.local.history.HistoryRecordManager; import org.schabi.newpipe.util.AnimationUtils; import org.schabi.newpipe.util.ImageDisplayConstants; import org.schabi.newpipe.util.Localization; import org.schabi.newpipe.views.AnimatedProgressBar; import java.text.DateFormat; +import java.util.ArrayList; import java.util.concurrent.TimeUnit; /* @@ -76,7 +78,7 @@ private String getStreamInfoDetailLine(final StreamStatisticsEntry entry, } @Override - public void updateFromItem(final LocalItem localItem, @Nullable final StreamStateEntity state, final DateFormat dateFormat) { + public void updateFromItem(final LocalItem localItem, HistoryRecordManager historyRecordManager, final DateFormat dateFormat) { if (!(localItem instanceof StreamStatisticsEntry)) return; final StreamStatisticsEntry item = (StreamStatisticsEntry) localItem; @@ -88,6 +90,8 @@ public void updateFromItem(final LocalItem localItem, @Nullable final StreamStat itemDurationView.setBackgroundColor(ContextCompat.getColor(itemBuilder.getContext(), R.color.duration_background_color)); itemDurationView.setVisibility(View.VISIBLE); + + StreamStateEntity state = historyRecordManager.loadLocalStreamStateBatch(new ArrayList() {{ add(localItem); }}).blockingGet().get(0); if (state != null) { itemProgressView.setVisibility(View.VISIBLE); itemProgressView.setMax((int) item.duration); @@ -124,9 +128,11 @@ public void updateFromItem(final LocalItem localItem, @Nullable final StreamStat } @Override - public void updateState(LocalItem localItem, @Nullable StreamStateEntity state) { + public void updateState(LocalItem localItem, HistoryRecordManager historyRecordManager) { if (!(localItem instanceof StreamStatisticsEntry)) return; final StreamStatisticsEntry item = (StreamStatisticsEntry) localItem; + + StreamStateEntity state = historyRecordManager.loadLocalStreamStateBatch(new ArrayList() {{ add(localItem); }}).blockingGet().get(0); if (state != null && item.duration > 0) { itemProgressView.setMax((int) item.duration); if (itemProgressView.getVisibility() == View.VISIBLE) { diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/PlaylistItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/PlaylistItemHolder.java index 2a81f95718c..c5f1813c707 100644 --- a/app/src/main/java/org/schabi/newpipe/local/holder/PlaylistItemHolder.java +++ b/app/src/main/java/org/schabi/newpipe/local/holder/PlaylistItemHolder.java @@ -1,14 +1,13 @@ package org.schabi.newpipe.local.holder; -import android.support.annotation.Nullable; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; import org.schabi.newpipe.R; import org.schabi.newpipe.database.LocalItem; -import org.schabi.newpipe.database.stream.model.StreamStateEntity; import org.schabi.newpipe.local.LocalItemBuilder; +import org.schabi.newpipe.local.history.HistoryRecordManager; import java.text.DateFormat; @@ -33,7 +32,7 @@ public PlaylistItemHolder(LocalItemBuilder infoItemBuilder, ViewGroup parent) { } @Override - public void updateFromItem(final LocalItem localItem, @Nullable final StreamStateEntity state, final DateFormat dateFormat) { + public void updateFromItem(final LocalItem localItem, HistoryRecordManager historyRecordManager, final DateFormat dateFormat) { itemView.setOnClickListener(view -> { if (itemBuilder.getOnItemSelectedListener() != null) { itemBuilder.getOnItemSelectedListener().selected(localItem); diff --git a/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistItemHolder.java b/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistItemHolder.java index bdcd42f6731..f9542850edd 100644 --- a/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistItemHolder.java +++ b/app/src/main/java/org/schabi/newpipe/local/holder/RemotePlaylistItemHolder.java @@ -1,13 +1,12 @@ package org.schabi.newpipe.local.holder; -import android.support.annotation.Nullable; import android.view.ViewGroup; import org.schabi.newpipe.database.LocalItem; import org.schabi.newpipe.database.playlist.model.PlaylistRemoteEntity; -import org.schabi.newpipe.database.stream.model.StreamStateEntity; import org.schabi.newpipe.extractor.NewPipe; import org.schabi.newpipe.local.LocalItemBuilder; +import org.schabi.newpipe.local.history.HistoryRecordManager; import org.schabi.newpipe.util.ImageDisplayConstants; import org.schabi.newpipe.util.Localization; @@ -23,7 +22,7 @@ public RemotePlaylistItemHolder(LocalItemBuilder infoItemBuilder, ViewGroup pare } @Override - public void updateFromItem(final LocalItem localItem, @Nullable final StreamStateEntity state, final DateFormat dateFormat) { + public void updateFromItem(final LocalItem localItem, HistoryRecordManager historyRecordManager, final DateFormat dateFormat) { if (!(localItem instanceof PlaylistRemoteEntity)) return; final PlaylistRemoteEntity item = (PlaylistRemoteEntity) localItem; @@ -35,6 +34,6 @@ public void updateFromItem(final LocalItem localItem, @Nullable final StreamStat itemBuilder.displayImage(item.getThumbnailUrl(), itemThumbnailView, ImageDisplayConstants.DISPLAY_PLAYLIST_OPTIONS); - super.updateFromItem(localItem, state, dateFormat); + super.updateFromItem(localItem, historyRecordManager, dateFormat); } } diff --git a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java index 50101664254..9e72838ad60 100644 --- a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java +++ b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistFragment.java @@ -2,14 +2,13 @@ import android.app.Activity; import android.content.Context; -import android.content.DialogInterface; import android.os.Bundle; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.app.AlertDialog; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.ItemTouchHelper; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; @@ -26,15 +25,16 @@ import org.schabi.newpipe.database.LocalItem; import org.schabi.newpipe.database.playlist.PlaylistStreamEntry; import org.schabi.newpipe.extractor.stream.StreamInfoItem; -import org.schabi.newpipe.local.BaseLocalListFragment; +import org.schabi.newpipe.extractor.stream.StreamType; import org.schabi.newpipe.info_list.InfoItemDialog; +import org.schabi.newpipe.local.BaseLocalListFragment; import org.schabi.newpipe.player.playqueue.PlayQueue; import org.schabi.newpipe.player.playqueue.SinglePlayQueue; import org.schabi.newpipe.report.UserAction; import org.schabi.newpipe.util.Localization; import org.schabi.newpipe.util.NavigationHelper; import org.schabi.newpipe.util.OnClickGesture; -import org.schabi.newpipe.util.ShareUtils; +import org.schabi.newpipe.util.StreamDialogEntry; import java.util.ArrayList; import java.util.Collections; @@ -511,59 +511,48 @@ public void onSwiped(RecyclerView.ViewHolder viewHolder, int swipeDir) {} // Utils //////////////////////////////////////////////////////////////////////////*/ + private PlayQueue getPlayQueueStartingAt(PlaylistStreamEntry infoItem) { + return getPlayQueue(Math.max(itemListAdapter.getItemsList().indexOf(infoItem), 0)); + } + protected void showStreamItemDialog(final PlaylistStreamEntry item) { final Context context = getContext(); final Activity activity = getActivity(); - if (context == null || context.getResources() == null || getActivity() == null) return; - + if (context == null || context.getResources() == null || activity == null) return; final StreamInfoItem infoItem = item.toStreamInfoItem(); - final String[] commands = new String[]{ - context.getResources().getString(R.string.enqueue_on_background), - context.getResources().getString(R.string.enqueue_on_popup), - context.getResources().getString(R.string.start_here_on_main), - context.getResources().getString(R.string.start_here_on_background), - context.getResources().getString(R.string.start_here_on_popup), - context.getResources().getString(R.string.set_as_playlist_thumbnail), - context.getResources().getString(R.string.delete), - context.getResources().getString(R.string.share) - }; + if (infoItem.getStreamType() == StreamType.AUDIO_STREAM) { + StreamDialogEntry.setEnabledEntries( + StreamDialogEntry.enqueue_on_background, + StreamDialogEntry.start_here_on_background, + StreamDialogEntry.set_as_playlist_thumbnail, + StreamDialogEntry.delete, + StreamDialogEntry.append_playlist, + StreamDialogEntry.share); + } else { + StreamDialogEntry.setEnabledEntries( + StreamDialogEntry.enqueue_on_background, + StreamDialogEntry.enqueue_on_popup, + StreamDialogEntry.start_here_on_background, + StreamDialogEntry.start_here_on_popup, + StreamDialogEntry.set_as_playlist_thumbnail, + StreamDialogEntry.delete, + StreamDialogEntry.append_playlist, + StreamDialogEntry.share); + + StreamDialogEntry.start_here_on_popup.setCustomAction( + (fragment, infoItemDuplicate) -> NavigationHelper.playOnPopupPlayer(context, getPlayQueueStartingAt(item), true)); + } - final DialogInterface.OnClickListener actions = (dialogInterface, i) -> { - final int index = Math.max(itemListAdapter.getItemsList().indexOf(item), 0); - switch (i) { - case 0: - NavigationHelper.enqueueOnBackgroundPlayer(context, - new SinglePlayQueue(infoItem), false); - break; - case 1: - NavigationHelper.enqueueOnPopupPlayer(activity, new - SinglePlayQueue(infoItem), false); - break; - case 2: - NavigationHelper.playOnMainPlayer(context, getPlayQueue(index), true); - break; - case 3: - NavigationHelper.playOnBackgroundPlayer(context, getPlayQueue(index), true); - break; - case 4: - NavigationHelper.playOnPopupPlayer(activity, getPlayQueue(index), true); - break; - case 5: - changeThumbnailUrl(item.thumbnailUrl); - break; - case 6: - deleteItem(item); - break; - case 7: - ShareUtils.shareUrl(this.getContext(), item.toStreamInfoItem().getName(), item.toStreamInfoItem().getUrl()); - break; - default: - break; - } - }; + StreamDialogEntry.start_here_on_background.setCustomAction( + (fragment, infoItemDuplicate) -> NavigationHelper.playOnBackgroundPlayer(context, getPlayQueueStartingAt(item), true)); + StreamDialogEntry.set_as_playlist_thumbnail.setCustomAction( + (fragment, infoItemDuplicate) -> changeThumbnailUrl(item.thumbnailUrl)); + StreamDialogEntry.delete.setCustomAction( + (fragment, infoItemDuplicate) -> deleteItem(item)); - new InfoItemDialog(getActivity(), infoItem, commands, actions).show(); + new InfoItemDialog(activity, infoItem, StreamDialogEntry.getCommands(context), (dialog, which) -> + StreamDialogEntry.clickOn(which, this, infoItem)).show(); } private void setInitialData(long playlistId, String name) { diff --git a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistManager.java b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistManager.java index 3ed1b864c3f..c025b360ab4 100644 --- a/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistManager.java +++ b/app/src/main/java/org/schabi/newpipe/local/playlist/LocalPlaylistManager.java @@ -1,6 +1,6 @@ package org.schabi.newpipe.local.playlist; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import org.schabi.newpipe.database.AppDatabase; import org.schabi.newpipe.database.playlist.PlaylistMetadataEntry; diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/ImportConfirmationDialog.java b/app/src/main/java/org/schabi/newpipe/local/subscription/ImportConfirmationDialog.java index 6ff151dc107..fbcf5d70e36 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/ImportConfirmationDialog.java +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/ImportConfirmationDialog.java @@ -4,10 +4,10 @@ import android.app.Dialog; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; import org.schabi.newpipe.R; import org.schabi.newpipe.util.ThemeHelper; diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/ImportExportJsonHelper.java b/app/src/main/java/org/schabi/newpipe/local/subscription/ImportExportJsonHelper.java index 6c8e8ea6cb6..ebfff9fe244 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/ImportExportJsonHelper.java +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/ImportExportJsonHelper.java @@ -19,7 +19,7 @@ package org.schabi.newpipe.local.subscription; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.grack.nanojson.JsonAppendableWriter; import com.grack.nanojson.JsonArray; diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java index b00ea05ea7f..bff6c1b3a1a 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionFragment.java @@ -17,15 +17,15 @@ import android.os.Environment; import android.os.Parcelable; import android.preference.PreferenceManager; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.FragmentManager; -import android.support.v4.content.LocalBroadcastManager; -import android.support.v7.app.ActionBar; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.FragmentManager; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; +import androidx.appcompat.app.ActionBar; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -130,7 +130,6 @@ public void onAttach(Context context) { @Override public void onDetach() { - infoListAdapter.dispose(); super.onDetach(); } @@ -153,8 +152,6 @@ public void onResume() { } updateFlags = 0; } - - itemsList.post(infoListAdapter::updateStates); } @Override @@ -382,7 +379,6 @@ public void held(ChannelInfoItem selectedItem) { }); - //noinspection ConstantConditions whatsNewItemListHeader.setOnClickListener(v -> { FragmentManager fragmentManager = getFM(); NavigationHelper.openWhatsNewFragment(fragmentManager); @@ -396,17 +392,17 @@ private void showLongTapDialog(ChannelInfoItem selectedItem) { if (context == null || context.getResources() == null || getActivity() == null) return; final String[] commands = new String[]{ - context.getResources().getString(R.string.share), - context.getResources().getString(R.string.unsubscribe) + context.getResources().getString(R.string.unsubscribe), + context.getResources().getString(R.string.share) }; final DialogInterface.OnClickListener actions = (dialogInterface, i) -> { switch (i) { case 0: - shareChannel(selectedItem); + deleteChannel(selectedItem); break; case 1: - deleteChannel(selectedItem); + shareChannel(selectedItem); break; default: break; @@ -430,12 +426,12 @@ private void showLongTapDialog(ChannelInfoItem selectedItem) { } - private void shareChannel (ChannelInfoItem selectedItem) { - ShareUtils.shareUrl(this.getContext(), selectedItem.getName(), selectedItem.getUrl()); + private void shareChannel(ChannelInfoItem selectedItem) { + ShareUtils.shareUrl(getContext(), selectedItem.getName(), selectedItem.getUrl()); } @SuppressLint("CheckResult") - private void deleteChannel (ChannelInfoItem selectedItem) { + private void deleteChannel(ChannelInfoItem selectedItem) { subscriptionService.subscriptionTable() .getSubscription(selectedItem.getServiceId(), selectedItem.getUrl()) .toObservable() @@ -447,7 +443,7 @@ private void deleteChannel (ChannelInfoItem selectedItem) { - private Observer> getDeleteObserver(){ + private Observer> getDeleteObserver() { return new Observer>() { @Override public void onSubscribe(Disposable d) { diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionService.java b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionService.java index 7aa04d8e81c..a431d23a938 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionService.java +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionService.java @@ -1,7 +1,7 @@ package org.schabi.newpipe.local.subscription; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import org.schabi.newpipe.MainActivity; @@ -94,7 +94,7 @@ private Flowable> getSubscriptionInfos() { * in the cooldown interval, only the latest changes are emitted to the subscribers. * This reduces the amount of observations caused by frequent updates to the database. */ - @android.support.annotation.NonNull + @androidx.annotation.NonNull public Flowable> getSubscription() { return subscription; } diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionsImportFragment.java b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionsImportFragment.java index ed694c70e62..0a45e680a37 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionsImportFragment.java +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/SubscriptionsImportFragment.java @@ -3,11 +3,11 @@ import android.app.Activity; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.text.util.LinkifyCompat; -import android.support.v7.app.ActionBar; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.core.text.util.LinkifyCompat; +import androidx.appcompat.app.ActionBar; import android.text.TextUtils; import android.text.util.Linkify; import android.view.LayoutInflater; diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/services/BaseImportExportService.java b/app/src/main/java/org/schabi/newpipe/local/subscription/services/BaseImportExportService.java index e3db6e12cf7..6b607cdcaa9 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/services/BaseImportExportService.java +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/services/BaseImportExportService.java @@ -23,11 +23,11 @@ import android.content.Intent; import android.os.Build; import android.os.IBinder; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.app.NotificationCompat; -import android.support.v4.app.NotificationManagerCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.core.app.NotificationCompat; +import androidx.core.app.NotificationManagerCompat; import android.text.TextUtils; import android.widget.Toast; diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsExportService.java b/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsExportService.java index 35da7dd4f6e..31cd4b60377 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsExportService.java +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsExportService.java @@ -20,7 +20,7 @@ package org.schabi.newpipe.local.subscription.services; import android.content.Intent; -import android.support.v4.content.LocalBroadcastManager; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.text.TextUtils; import android.util.Log; diff --git a/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java b/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java index 48410205a8e..62c1dfeb9ee 100644 --- a/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java +++ b/app/src/main/java/org/schabi/newpipe/local/subscription/services/SubscriptionsImportService.java @@ -20,9 +20,9 @@ package org.schabi.newpipe.local.subscription.services; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.LocalBroadcastManager; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; import android.text.TextUtils; import android.util.Log; diff --git a/app/src/main/java/org/schabi/newpipe/notifications/NotificationHelper.java b/app/src/main/java/org/schabi/newpipe/notifications/NotificationHelper.java index eab249508d0..9fff95340ff 100644 --- a/app/src/main/java/org/schabi/newpipe/notifications/NotificationHelper.java +++ b/app/src/main/java/org/schabi/newpipe/notifications/NotificationHelper.java @@ -9,9 +9,10 @@ import android.net.Uri; import android.os.Build; import android.provider.Settings; -import android.support.v4.app.NotificationCompat; -import android.support.v4.app.NotificationManagerCompat; -import android.support.v4.content.ContextCompat; + +import androidx.core.app.NotificationCompat; +import androidx.core.app.NotificationManagerCompat; +import androidx.core.content.ContextCompat; import org.schabi.newpipe.BuildConfig; import org.schabi.newpipe.R; diff --git a/app/src/main/java/org/schabi/newpipe/notifications/NotificationJobService.java b/app/src/main/java/org/schabi/newpipe/notifications/NotificationJobService.java index 41baf847fff..ebc18559a1b 100644 --- a/app/src/main/java/org/schabi/newpipe/notifications/NotificationJobService.java +++ b/app/src/main/java/org/schabi/newpipe/notifications/NotificationJobService.java @@ -4,8 +4,9 @@ import android.app.job.JobService; import android.content.Context; import android.os.Build; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; + +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; import org.schabi.newpipe.notifications.scheduler.NotificationsScheduler; import org.schabi.newpipe.notifications.scheduler.ScheduleLogger; @@ -13,7 +14,6 @@ import io.reactivex.BackpressureStrategy; import io.reactivex.Flowable; -import io.reactivex.Scheduler; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.disposables.Disposable; import io.reactivex.schedulers.Schedulers; diff --git a/app/src/main/java/org/schabi/newpipe/notifications/NotificationService.java b/app/src/main/java/org/schabi/newpipe/notifications/NotificationService.java index 9ab8c1080e0..f94bfaa1bda 100644 --- a/app/src/main/java/org/schabi/newpipe/notifications/NotificationService.java +++ b/app/src/main/java/org/schabi/newpipe/notifications/NotificationService.java @@ -6,7 +6,8 @@ import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.os.IBinder; -import android.support.annotation.Nullable; + +import androidx.annotation.Nullable; import org.schabi.newpipe.notifications.scheduler.NotificationsScheduler; import org.schabi.newpipe.notifications.scheduler.ScheduleLogger; diff --git a/app/src/main/java/org/schabi/newpipe/notifications/SubscriptionUpdates.java b/app/src/main/java/org/schabi/newpipe/notifications/SubscriptionUpdates.java index dc4660783e6..5c9a2e62d62 100644 --- a/app/src/main/java/org/schabi/newpipe/notifications/SubscriptionUpdates.java +++ b/app/src/main/java/org/schabi/newpipe/notifications/SubscriptionUpdates.java @@ -1,7 +1,8 @@ package org.schabi.newpipe.notifications; import android.content.Context; -import android.support.annotation.NonNull; + +import androidx.annotation.NonNull; import org.schabi.newpipe.NewPipeDatabase; import org.schabi.newpipe.database.stream.dao.StreamDAO; diff --git a/app/src/main/java/org/schabi/newpipe/notifications/scheduler/JobNotificationScheduler.java b/app/src/main/java/org/schabi/newpipe/notifications/scheduler/JobNotificationScheduler.java index d6e3bcfc3cc..c41480cf8af 100644 --- a/app/src/main/java/org/schabi/newpipe/notifications/scheduler/JobNotificationScheduler.java +++ b/app/src/main/java/org/schabi/newpipe/notifications/scheduler/JobNotificationScheduler.java @@ -5,7 +5,8 @@ import android.content.ComponentName; import android.content.Context; import android.os.Build; -import android.support.annotation.RequiresApi; + +import androidx.annotation.RequiresApi; import org.schabi.newpipe.notifications.NotificationJobService; diff --git a/app/src/main/java/org/schabi/newpipe/notifications/scheduler/ScheduleLogger.java b/app/src/main/java/org/schabi/newpipe/notifications/scheduler/ScheduleLogger.java index befe3f4fc69..b7ef1d81d35 100644 --- a/app/src/main/java/org/schabi/newpipe/notifications/scheduler/ScheduleLogger.java +++ b/app/src/main/java/org/schabi/newpipe/notifications/scheduler/ScheduleLogger.java @@ -1,10 +1,11 @@ package org.schabi.newpipe.notifications.scheduler; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.text.format.DateFormat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import org.schabi.newpipe.BuildConfig; import java.io.BufferedReader; diff --git a/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java b/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java index c954885419f..ab07ded2273 100644 --- a/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java +++ b/app/src/main/java/org/schabi/newpipe/player/BackgroundPlayer.java @@ -28,9 +28,9 @@ import android.graphics.Bitmap; import android.os.Build; import android.os.IBinder; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.NotificationCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.NotificationCompat; import android.util.Log; import android.view.View; import android.widget.RemoteViews; diff --git a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java index 11434b29d6e..b3c5716bcf4 100644 --- a/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java +++ b/app/src/main/java/org/schabi/newpipe/player/BasePlayer.java @@ -28,12 +28,13 @@ import android.graphics.BitmapFactory; import android.media.AudioManager; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.util.Log; import android.view.View; import android.widget.Toast; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.google.android.exoplayer2.DefaultRenderersFactory; import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.ExoPlayerFactory; @@ -187,6 +188,7 @@ public abstract class BasePlayer implements protected MediaSessionManager mediaSessionManager; private boolean isPrepared = false; + private Disposable stateLoader; //////////////////////////////////////////////////////////////////////////*/ @@ -208,7 +210,7 @@ public void onReceive(Context context, Intent intent) { this.databaseUpdateReactor = new CompositeDisposable(); final String userAgent = Downloader.USER_AGENT; - final DefaultBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter(); + final DefaultBandwidthMeter bandwidthMeter = new DefaultBandwidthMeter.Builder(context).build(); this.dataSource = new PlayerDataSource(context, userAgent, bandwidthMeter); final TrackSelection.Factory trackSelectionFactory = PlayerHelper.getQualitySelector(context); @@ -283,10 +285,11 @@ public void handleIntent(Intent intent) { ) { simpleExoPlayer.seekTo(playQueue.getIndex(), queue.getItem().getRecoveryPosition()); return; + } else if (intent.getBooleanExtra(RESUME_PLAYBACK, false) && isPlaybackResumeEnabled()) { final PlayQueueItem item = queue.getItem(); - if (item != null && item.getRecoveryPosition() == PlayQueueItem.RECOVERY_UNSET && isPlaybackResumeEnabled()) { - final Disposable stateLoader = recordManager.loadStreamState(item) + if (item != null && item.getRecoveryPosition() == PlayQueueItem.RECOVERY_UNSET) { + stateLoader = recordManager.loadStreamState(item) .observeOn(AndroidSchedulers.mainThread()) .doFinally(() -> initPlayback(queue, repeatMode, playbackSpeed, playbackPitch, playbackSkipSilence, /*playOnInit=*/true)) @@ -337,6 +340,7 @@ public void destroyPlayer() { if (audioReactor != null) audioReactor.dispose(); if (playbackManager != null) playbackManager.dispose(); if (mediaSessionManager != null) mediaSessionManager.dispose(); + if (stateLoader != null) stateLoader.dispose(); if (playQueueAdapter != null) { playQueueAdapter.unsetSelectedListener(); @@ -1046,27 +1050,33 @@ protected void reload() { private void savePlaybackState(final StreamInfo info, final long progress) { if (info == null) return; if (DEBUG) Log.d(TAG, "savePlaybackState() called"); - final Disposable stateSaver = recordManager.saveStreamState(info, progress) - .observeOn(AndroidSchedulers.mainThread()) - .doOnError((e) -> { - if (DEBUG) e.printStackTrace(); - }) - .onErrorComplete() - .subscribe(); - databaseUpdateReactor.add(stateSaver); + final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + if (prefs.getBoolean(context.getString(R.string.enable_watch_history_key), true)) { + final Disposable stateSaver = recordManager.saveStreamState(info, progress) + .observeOn(AndroidSchedulers.mainThread()) + .doOnError((e) -> { + if (DEBUG) e.printStackTrace(); + }) + .onErrorComplete() + .subscribe(); + databaseUpdateReactor.add(stateSaver); + } } private void resetPlaybackState(final PlayQueueItem queueItem) { if (queueItem == null) return; - final Disposable stateSaver = queueItem.getStream() - .flatMapCompletable(info -> recordManager.saveStreamState(info, 0)) - .observeOn(AndroidSchedulers.mainThread()) - .doOnError((e) -> { - if (DEBUG) e.printStackTrace(); - }) - .onErrorComplete() - .subscribe(); - databaseUpdateReactor.add(stateSaver); + final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + if (prefs.getBoolean(context.getString(R.string.enable_watch_history_key), true)) { + final Disposable stateSaver = queueItem.getStream() + .flatMapCompletable(info -> recordManager.saveStreamState(info, 0)) + .observeOn(AndroidSchedulers.mainThread()) + .doOnError((e) -> { + if (DEBUG) e.printStackTrace(); + }) + .onErrorComplete() + .subscribe(); + databaseUpdateReactor.add(stateSaver); + } } public void resetPlaybackState(final StreamInfo info) { @@ -1184,10 +1194,7 @@ public boolean isLive() { } public boolean isPlaying() { - if (simpleExoPlayer == null) return false; - final int state = simpleExoPlayer.getPlaybackState(); - return (state == Player.STATE_READY || state == Player.STATE_BUFFERING) - && simpleExoPlayer.getPlayWhenReady(); + return simpleExoPlayer != null && simpleExoPlayer.isPlaying(); } @Player.RepeatMode diff --git a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java index f48ad7019d2..7a3e60c660e 100644 --- a/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java +++ b/app/src/main/java/org/schabi/newpipe/player/MainVideoPlayer.java @@ -24,21 +24,23 @@ import android.content.SharedPreferences; import android.content.pm.ActivityInfo; import android.content.res.Configuration; +import android.database.ContentObserver; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.media.AudioManager; import android.os.Build; import android.os.Bundle; +import android.os.Handler; import android.preference.PreferenceManager; import android.provider.Settings; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.ActivityCompat; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.content.res.AppCompatResources; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.app.ActivityCompat; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.content.res.AppCompatResources; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.ItemTouchHelper; import android.util.DisplayMetrics; import android.util.Log; import android.util.TypedValue; @@ -113,6 +115,8 @@ public final class MainVideoPlayer extends AppCompatActivity private boolean isInMultiWindow; private boolean isBackPressed; + private ContentObserver rotationObserver; + /*////////////////////////////////////////////////////////////////////////// // Activity LifeCycle //////////////////////////////////////////////////////////////////////////*/ @@ -147,6 +151,23 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { Toast.makeText(this, R.string.general_error, Toast.LENGTH_SHORT).show(); finish(); } + + rotationObserver = new ContentObserver(new Handler()) { + @Override + public void onChange(boolean selfChange) { + super.onChange(selfChange); + if (globalScreenOrientationLocked()) { + final boolean lastOrientationWasLandscape = defaultPreferences.getBoolean( + getString(R.string.last_orientation_landscape_key), false); + setLandscape(lastOrientationWasLandscape); + } else { + setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_UNSPECIFIED); + } + } + }; + getContentResolver().registerContentObserver( + Settings.System.getUriFor(Settings.System.ACCELEROMETER_ROTATION), + false, rotationObserver); } @Override @@ -239,6 +260,9 @@ protected void onStop() { playerState = createPlayerState(); playerImpl.destroy(); + if (rotationObserver != null) + getContentResolver().unregisterContentObserver(rotationObserver); + isInMultiWindow = false; isBackPressed = false; } diff --git a/app/src/main/java/org/schabi/newpipe/player/PlayerServiceBinder.java b/app/src/main/java/org/schabi/newpipe/player/PlayerServiceBinder.java index 80c27be7f01..ef9d92aa037 100644 --- a/app/src/main/java/org/schabi/newpipe/player/PlayerServiceBinder.java +++ b/app/src/main/java/org/schabi/newpipe/player/PlayerServiceBinder.java @@ -1,7 +1,7 @@ package org.schabi.newpipe.player; import android.os.Binder; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; class PlayerServiceBinder extends Binder { private final BasePlayer basePlayer; diff --git a/app/src/main/java/org/schabi/newpipe/player/PlayerState.java b/app/src/main/java/org/schabi/newpipe/player/PlayerState.java index 359159809db..308e8100eb4 100644 --- a/app/src/main/java/org/schabi/newpipe/player/PlayerState.java +++ b/app/src/main/java/org/schabi/newpipe/player/PlayerState.java @@ -1,7 +1,7 @@ package org.schabi.newpipe.player; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.schabi.newpipe.player.playqueue.PlayQueue; diff --git a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java index 3782d85c007..68446ed9ffb 100644 --- a/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java +++ b/app/src/main/java/org/schabi/newpipe/player/PopupVideoPlayer.java @@ -35,9 +35,9 @@ import android.os.Build; import android.os.IBinder; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.design.widget.FloatingActionButton; -import android.support.v4.app.NotificationCompat; +import androidx.annotation.NonNull; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import androidx.core.app.NotificationCompat; import android.util.DisplayMetrics; import android.util.Log; import android.view.GestureDetector; diff --git a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java index bdd31f21bbd..2207808ac04 100644 --- a/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java +++ b/app/src/main/java/org/schabi/newpipe/player/ServicePlayerActivity.java @@ -6,11 +6,11 @@ import android.os.Bundle; import android.os.IBinder; import android.provider.Settings; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.Toolbar; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.appcompat.widget.Toolbar; +import androidx.recyclerview.widget.ItemTouchHelper; import android.util.Log; import android.view.Menu; import android.view.MenuItem; diff --git a/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java b/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java index 7ce778e6a79..360475ba204 100644 --- a/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java +++ b/app/src/main/java/org/schabi/newpipe/player/VideoPlayer.java @@ -31,9 +31,9 @@ import android.graphics.PorterDuff; import android.os.Build; import android.os.Handler; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import android.util.Log; import android.view.Menu; import android.view.MenuItem; diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java b/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java index 24d1ee1cac2..8f344390adf 100644 --- a/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java +++ b/app/src/main/java/org/schabi/newpipe/player/helper/AudioReactor.java @@ -9,7 +9,7 @@ import android.media.AudioManager; import android.media.audiofx.AudioEffect; import android.os.Build; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import com.google.android.exoplayer2.SimpleExoPlayer; diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/CacheFactory.java b/app/src/main/java/org/schabi/newpipe/player/helper/CacheFactory.java index 091efc94260..8160640cb81 100644 --- a/app/src/main/java/org/schabi/newpipe/player/helper/CacheFactory.java +++ b/app/src/main/java/org/schabi/newpipe/player/helper/CacheFactory.java @@ -1,9 +1,11 @@ package org.schabi.newpipe.player.helper; import android.content.Context; -import android.support.annotation.NonNull; import android.util.Log; +import androidx.annotation.NonNull; + +import com.google.android.exoplayer2.database.ExoDatabaseProvider; import com.google.android.exoplayer2.upstream.DataSource; import com.google.android.exoplayer2.upstream.DefaultDataSource; import com.google.android.exoplayer2.upstream.DefaultDataSourceFactory; @@ -54,7 +56,7 @@ private CacheFactory(@NonNull final Context context, if (cache == null) { final LeastRecentlyUsedCacheEvictor evictor = new LeastRecentlyUsedCacheEvictor(maxCacheSize); - cache = new SimpleCache(cacheDir, evictor); + cache = new SimpleCache(cacheDir, evictor, new ExoDatabaseProvider(context)); } } diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java b/app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java index 63c0bf33329..a5c70383700 100644 --- a/app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java +++ b/app/src/main/java/org/schabi/newpipe/player/helper/MediaSessionManager.java @@ -2,12 +2,13 @@ import android.content.Context; import android.content.Intent; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.media.session.MediaButtonReceiver; import android.support.v4.media.session.MediaSessionCompat; import android.view.KeyEvent; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.media.session.MediaButtonReceiver; + import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector; @@ -27,10 +28,10 @@ public MediaSessionManager(@NonNull final Context context, this.mediaSession = new MediaSessionCompat(context, TAG); this.mediaSession.setActive(true); - this.sessionConnector = new MediaSessionConnector(mediaSession, - new PlayQueuePlaybackController(callback)); + this.sessionConnector = new MediaSessionConnector(mediaSession); + this.sessionConnector.setControlDispatcher(new PlayQueuePlaybackController(callback)); this.sessionConnector.setQueueNavigator(new PlayQueueNavigator(mediaSession, callback)); - this.sessionConnector.setPlayer(player, null); + this.sessionConnector.setPlayer(player); } @Nullable @@ -43,7 +44,7 @@ public KeyEvent handleMediaButtonIntent(final Intent intent) { * Should be called on player destruction to prevent leakage. * */ public void dispose() { - this.sessionConnector.setPlayer(null, null); + this.sessionConnector.setPlayer(null); this.sessionConnector.setQueueNavigator(null); this.mediaSession.setActive(false); this.mediaSession.release(); diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java index f49ca333077..4feed74fee9 100644 --- a/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java +++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlaybackParameterDialog.java @@ -3,10 +3,10 @@ import android.app.Dialog; import android.content.Context; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; +import androidx.appcompat.app.AlertDialog; import android.util.Log; import android.view.View; import android.widget.CheckBox; diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerDataSource.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerDataSource.java index 5743891c2a6..5aa331dc575 100644 --- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerDataSource.java +++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerDataSource.java @@ -1,9 +1,10 @@ package org.schabi.newpipe.player.helper; import android.content.Context; -import android.support.annotation.NonNull; -import com.google.android.exoplayer2.source.ExtractorMediaSource; +import androidx.annotation.NonNull; + +import com.google.android.exoplayer2.source.ProgressiveMediaSource; import com.google.android.exoplayer2.source.SingleSampleMediaSource; import com.google.android.exoplayer2.source.dash.DashMediaSource; import com.google.android.exoplayer2.source.dash.DefaultDashChunkSource; @@ -64,12 +65,12 @@ public DashMediaSource.Factory getDashMediaSourceFactory() { cacheDataSourceFactory), cacheDataSourceFactory); } - public ExtractorMediaSource.Factory getExtractorMediaSourceFactory() { - return new ExtractorMediaSource.Factory(cacheDataSourceFactory) + public ProgressiveMediaSource.Factory getExtractorMediaSourceFactory() { + return new ProgressiveMediaSource.Factory(cacheDataSourceFactory) .setLoadErrorHandlingPolicy(new DefaultLoadErrorHandlingPolicy(EXTRACTOR_MINIMUM_RETRY)); } - public ExtractorMediaSource.Factory getExtractorMediaSourceFactory(@NonNull final String key) { + public ProgressiveMediaSource.Factory getExtractorMediaSourceFactory(@NonNull final String key) { return getExtractorMediaSourceFactory().setCustomCacheKey(key); } diff --git a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java index 7248857b541..5ca02980d17 100644 --- a/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java +++ b/app/src/main/java/org/schabi/newpipe/player/helper/PlayerHelper.java @@ -4,9 +4,9 @@ import android.content.SharedPreferences; import android.os.Build; import android.preference.PreferenceManager; -import android.support.annotation.IntDef; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.IntDef; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.view.accessibility.CaptioningManager; import com.google.android.exoplayer2.SeekParameters; diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueueNavigator.java b/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueueNavigator.java index 3d1fd171f51..ab0de08bedb 100644 --- a/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueueNavigator.java +++ b/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueueNavigator.java @@ -2,10 +2,12 @@ import android.os.Bundle; import android.os.ResultReceiver; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; import android.support.v4.media.session.MediaSessionCompat; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + +import com.google.android.exoplayer2.ControlDispatcher; import com.google.android.exoplayer2.Player; import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector; import com.google.android.exoplayer2.util.Util; @@ -63,17 +65,17 @@ public long getActiveQueueItemId(@Nullable Player player) { } @Override - public void onSkipToPrevious(Player player) { + public void onSkipToPrevious(Player player, ControlDispatcher controlDispatcher) { callback.onSkipToPrevious(); } @Override - public void onSkipToQueueItem(Player player, long id) { + public void onSkipToQueueItem(Player player, ControlDispatcher controlDispatcher, long id) { callback.onSkipToIndex((int) id); } @Override - public void onSkipToNext(Player player) { + public void onSkipToNext(Player player, ControlDispatcher controlDispatcher) { callback.onSkipToNext(); } @@ -100,12 +102,7 @@ private void publishFloatingQueueWindow() { } @Override - public String[] getCommands() { - return new String[0]; - } - - @Override - public void onCommand(Player player, String command, Bundle extras, ResultReceiver cb) { - + public boolean onCommand(Player player, ControlDispatcher controlDispatcher, String command, Bundle extras, ResultReceiver cb) { + return false; } } diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueuePlaybackController.java b/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueuePlaybackController.java index a460a1653c2..b7f0638e386 100644 --- a/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueuePlaybackController.java +++ b/app/src/main/java/org/schabi/newpipe/player/mediasession/PlayQueuePlaybackController.java @@ -1,9 +1,9 @@ package org.schabi.newpipe.player.mediasession; +import com.google.android.exoplayer2.DefaultControlDispatcher; import com.google.android.exoplayer2.Player; -import com.google.android.exoplayer2.ext.mediasession.DefaultPlaybackController; -public class PlayQueuePlaybackController extends DefaultPlaybackController { +public class PlayQueuePlaybackController extends DefaultControlDispatcher { private final MediaSessionCallback callback; public PlayQueuePlaybackController(final MediaSessionCallback callback) { @@ -12,12 +12,12 @@ public PlayQueuePlaybackController(final MediaSessionCallback callback) { } @Override - public void onPlay(Player player) { - callback.onPlay(); - } - - @Override - public void onPause(Player player) { - callback.onPause(); + public boolean dispatchSetPlayWhenReady(Player player, boolean playWhenReady) { + if (playWhenReady) { + callback.onPlay(); + } else { + callback.onPause(); + } + return true; } } diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasource/FailedMediaSource.java b/app/src/main/java/org/schabi/newpipe/player/mediasource/FailedMediaSource.java index cc9cd36bc0d..b99047417b7 100644 --- a/app/src/main/java/org/schabi/newpipe/player/mediasource/FailedMediaSource.java +++ b/app/src/main/java/org/schabi/newpipe/player/mediasource/FailedMediaSource.java @@ -1,7 +1,7 @@ package org.schabi.newpipe.player.mediasource; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.Log; import com.google.android.exoplayer2.source.BaseMediaSource; diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasource/LoadedMediaSource.java b/app/src/main/java/org/schabi/newpipe/player/mediasource/LoadedMediaSource.java index d36a3e30590..1519103c2eb 100644 --- a/app/src/main/java/org/schabi/newpipe/player/mediasource/LoadedMediaSource.java +++ b/app/src/main/java/org/schabi/newpipe/player/mediasource/LoadedMediaSource.java @@ -1,8 +1,8 @@ package org.schabi.newpipe.player.mediasource; import android.os.Handler; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.android.exoplayer2.source.MediaPeriod; import com.google.android.exoplayer2.source.MediaSource; diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSource.java b/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSource.java index 8837e752973..b180ca9f26c 100644 --- a/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSource.java +++ b/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSource.java @@ -1,6 +1,6 @@ package org.schabi.newpipe.player.mediasource; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import com.google.android.exoplayer2.source.MediaSource; diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSourcePlaylist.java b/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSourcePlaylist.java index fe29707fcef..76f0976652e 100644 --- a/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSourcePlaylist.java +++ b/app/src/main/java/org/schabi/newpipe/player/mediasource/ManagedMediaSourcePlaylist.java @@ -1,7 +1,7 @@ package org.schabi.newpipe.player.mediasource; import android.os.Handler; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.android.exoplayer2.source.ConcatenatingMediaSource; import com.google.android.exoplayer2.source.ShuffleOrder; diff --git a/app/src/main/java/org/schabi/newpipe/player/mediasource/PlaceholderMediaSource.java b/app/src/main/java/org/schabi/newpipe/player/mediasource/PlaceholderMediaSource.java index 377ca55a365..48179aed525 100644 --- a/app/src/main/java/org/schabi/newpipe/player/mediasource/PlaceholderMediaSource.java +++ b/app/src/main/java/org/schabi/newpipe/player/mediasource/PlaceholderMediaSource.java @@ -1,7 +1,7 @@ package org.schabi.newpipe.player.mediasource; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.android.exoplayer2.source.BaseMediaSource; import com.google.android.exoplayer2.source.MediaPeriod; diff --git a/app/src/main/java/org/schabi/newpipe/player/playback/BasePlayerMediaSession.java b/app/src/main/java/org/schabi/newpipe/player/playback/BasePlayerMediaSession.java index 657fe13270d..7b55629b8d9 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playback/BasePlayerMediaSession.java +++ b/app/src/main/java/org/schabi/newpipe/player/playback/BasePlayerMediaSession.java @@ -58,8 +58,11 @@ public MediaDescriptionCompat getQueueMetadata(int index) { // set additional metadata for A2DP/AVRCP Bundle additionalMetadata = new Bundle(); + additionalMetadata.putString(MediaMetadataCompat.METADATA_KEY_TITLE, item.getTitle()); additionalMetadata.putString(MediaMetadataCompat.METADATA_KEY_ARTIST, item.getUploader()); - additionalMetadata.putLong(MediaMetadataCompat.METADATA_KEY_DURATION, item.getDuration()); + additionalMetadata.putLong(MediaMetadataCompat.METADATA_KEY_DURATION, item.getDuration() * 1000); + additionalMetadata.putLong(MediaMetadataCompat.METADATA_KEY_TRACK_NUMBER, index + 1); + additionalMetadata.putLong(MediaMetadataCompat.METADATA_KEY_NUM_TRACKS, player.getPlayQueue().size()); descriptionBuilder.setExtras(additionalMetadata); final Uri thumbnailUri = Uri.parse(item.getThumbnailUrl()); diff --git a/app/src/main/java/org/schabi/newpipe/player/playback/CustomTrackSelector.java b/app/src/main/java/org/schabi/newpipe/player/playback/CustomTrackSelector.java index 063d6b93ec4..d51cf630d2c 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playback/CustomTrackSelector.java +++ b/app/src/main/java/org/schabi/newpipe/player/playback/CustomTrackSelector.java @@ -1,15 +1,17 @@ package org.schabi.newpipe.player.playback; -import android.support.annotation.NonNull; import android.text.TextUtils; import android.util.Pair; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; + import com.google.android.exoplayer2.C; +import com.google.android.exoplayer2.ExoPlaybackException; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.source.TrackGroup; import com.google.android.exoplayer2.source.TrackGroupArray; import com.google.android.exoplayer2.trackselection.DefaultTrackSelector; -import com.google.android.exoplayer2.trackselection.FixedTrackSelection; import com.google.android.exoplayer2.trackselection.TrackSelection; import com.google.android.exoplayer2.util.Assertions; @@ -21,7 +23,6 @@ * a broader set of languages. * */ public class CustomTrackSelector extends DefaultTrackSelector { - private static final int WITHIN_RENDERER_CAPABILITIES_BONUS = 1000; private String preferredTextLanguage; @@ -41,23 +42,22 @@ public void setPreferredTextLanguage(@NonNull final String label) { } } - /** @see DefaultTrackSelector#formatHasLanguage(Format, String)*/ - protected static boolean formatHasLanguage(Format format, String language) { + private static boolean formatHasLanguage(Format format, String language) { return language != null && TextUtils.equals(language, format.language); } - /** @see DefaultTrackSelector#formatHasNoLanguage(Format)*/ - protected static boolean formatHasNoLanguage(Format format) { - return TextUtils.isEmpty(format.language) || formatHasLanguage(format, C.LANGUAGE_UNDETERMINED); - } - - /** @see DefaultTrackSelector#selectTextTrack(TrackGroupArray, int[][], Parameters) */ @Override - protected Pair selectTextTrack(TrackGroupArray groups, int[][] formatSupport, - Parameters params) { + @Nullable + protected Pair selectTextTrack( + TrackGroupArray groups, + int[][] formatSupport, + Parameters params, + @Nullable String selectedAudioLanguage) + throws ExoPlaybackException { TrackGroup selectedGroup = null; - int selectedTrackIndex = 0; - int selectedTrackScore = 0; + int selectedTrackIndex = C.INDEX_UNSET; + int newPipeTrackScore = 0; + TextTrackScore selectedTrackScore = null; for (int groupIndex = 0; groupIndex < groups.length; groupIndex++) { TrackGroup trackGroup = groups.get(groupIndex); int[] trackFormatSupport = formatSupport[groupIndex]; @@ -65,41 +65,17 @@ protected Pair selectTextTrack(TrackGroupArray groups, if (isSupported(trackFormatSupport[trackIndex], params.exceedRendererCapabilitiesIfNecessary)) { Format format = trackGroup.getFormat(trackIndex); - int maskedSelectionFlags = - format.selectionFlags & ~params.disabledTextTrackSelectionFlags; - boolean isDefault = (maskedSelectionFlags & C.SELECTION_FLAG_DEFAULT) != 0; - boolean isForced = (maskedSelectionFlags & C.SELECTION_FLAG_FORCED) != 0; - int trackScore; - boolean preferredLanguageFound = formatHasLanguage(format, preferredTextLanguage); - if (preferredLanguageFound - || (params.selectUndeterminedTextLanguage && formatHasNoLanguage(format))) { - if (isDefault) { - trackScore = 8; - } else if (!isForced) { - // Prefer non-forced to forced if a preferred text language has been specified. Where - // both are provided the non-forced track will usually contain the forced subtitles as - // a subset. - trackScore = 6; - } else { - trackScore = 4; - } - trackScore += preferredLanguageFound ? 1 : 0; - } else if (isDefault) { - trackScore = 3; - } else if (isForced) { - if (formatHasLanguage(format, params.preferredAudioLanguage)) { - trackScore = 2; - } else { - trackScore = 1; - } - } else { - // Track should not be selected. - continue; - } - if (isSupported(trackFormatSupport[trackIndex], false)) { - trackScore += WITHIN_RENDERER_CAPABILITIES_BONUS; - } - if (trackScore > selectedTrackScore) { + TextTrackScore trackScore = + new TextTrackScore( + format, params, trackFormatSupport[trackIndex], selectedAudioLanguage); + if (formatHasLanguage(format, preferredTextLanguage)) { + selectedGroup = trackGroup; + selectedTrackIndex = trackIndex; + selectedTrackScore = trackScore; + // found user selected match (perfect!) + break; + } else if (trackScore.isWithinConstraints + && (selectedTrackScore == null || trackScore.compareTo(selectedTrackScore) > 0)) { selectedGroup = trackGroup; selectedTrackIndex = trackIndex; selectedTrackScore = trackScore; @@ -110,6 +86,7 @@ protected Pair selectTextTrack(TrackGroupArray groups, return selectedGroup == null ? null : Pair.create( - new FixedTrackSelection(selectedGroup, selectedTrackIndex), selectedTrackScore); + new TrackSelection.Definition(selectedGroup, selectedTrackIndex), + Assertions.checkNotNull(selectedTrackScore)); } -} \ No newline at end of file +} diff --git a/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java b/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java index fb1a609cc34..85c852f5716 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java +++ b/app/src/main/java/org/schabi/newpipe/player/playback/MediaSourceManager.java @@ -1,8 +1,8 @@ package org.schabi.newpipe.player.playback; import android.os.Handler; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.util.ArraySet; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.collection.ArraySet; import android.util.Log; import com.google.android.exoplayer2.source.MediaSource; diff --git a/app/src/main/java/org/schabi/newpipe/player/playback/PlaybackListener.java b/app/src/main/java/org/schabi/newpipe/player/playback/PlaybackListener.java index 4e79c6d7521..9682ea15e50 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playback/PlaybackListener.java +++ b/app/src/main/java/org/schabi/newpipe/player/playback/PlaybackListener.java @@ -1,7 +1,7 @@ package org.schabi.newpipe.player.playback; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.android.exoplayer2.source.MediaSource; diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java index 2a7c9f1274e..fcb1e28193f 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueue.java @@ -1,7 +1,7 @@ package org.schabi.newpipe.player.playqueue; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.util.Log; import org.reactivestreams.Subscriber; diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueAdapter.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueAdapter.java index eb2d678e025..b74736c49d0 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueAdapter.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueAdapter.java @@ -1,7 +1,7 @@ package org.schabi.newpipe.player.playqueue; import android.content.Context; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItem.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItem.java index bd02184540e..309f22ad579 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItem.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItem.java @@ -1,7 +1,7 @@ package org.schabi.newpipe.player.playqueue; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.schabi.newpipe.extractor.stream.StreamInfo; import org.schabi.newpipe.extractor.stream.StreamInfoItem; diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemHolder.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemHolder.java index effb9aae981..7ad34b91eac 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemHolder.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemHolder.java @@ -1,6 +1,6 @@ package org.schabi.newpipe.player.playqueue; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; import android.widget.ImageView; import android.widget.TextView; diff --git a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemTouchCallback.java b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemTouchCallback.java index 26be83b981a..38e8e092a03 100644 --- a/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemTouchCallback.java +++ b/app/src/main/java/org/schabi/newpipe/player/playqueue/PlayQueueItemTouchCallback.java @@ -1,7 +1,7 @@ package org.schabi.newpipe.player.playqueue; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.ItemTouchHelper; public abstract class PlayQueueItemTouchCallback extends ItemTouchHelper.SimpleCallback { private static final int MINIMUM_INITIAL_DRAG_VELOCITY = 10; diff --git a/app/src/main/java/org/schabi/newpipe/player/resolver/AudioPlaybackResolver.java b/app/src/main/java/org/schabi/newpipe/player/resolver/AudioPlaybackResolver.java index 6bb556850e0..7e9199040df 100644 --- a/app/src/main/java/org/schabi/newpipe/player/resolver/AudioPlaybackResolver.java +++ b/app/src/main/java/org/schabi/newpipe/player/resolver/AudioPlaybackResolver.java @@ -1,8 +1,8 @@ package org.schabi.newpipe.player.resolver; import android.content.Context; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.android.exoplayer2.source.MediaSource; diff --git a/app/src/main/java/org/schabi/newpipe/player/resolver/MediaSourceTag.java b/app/src/main/java/org/schabi/newpipe/player/resolver/MediaSourceTag.java index bbe5d33ca54..d8c0c89b735 100644 --- a/app/src/main/java/org/schabi/newpipe/player/resolver/MediaSourceTag.java +++ b/app/src/main/java/org/schabi/newpipe/player/resolver/MediaSourceTag.java @@ -1,7 +1,7 @@ package org.schabi.newpipe.player.resolver; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import org.schabi.newpipe.extractor.stream.StreamInfo; import org.schabi.newpipe.extractor.stream.VideoStream; diff --git a/app/src/main/java/org/schabi/newpipe/player/resolver/PlaybackResolver.java b/app/src/main/java/org/schabi/newpipe/player/resolver/PlaybackResolver.java index 1da3ec2115e..ef28f71ee13 100644 --- a/app/src/main/java/org/schabi/newpipe/player/resolver/PlaybackResolver.java +++ b/app/src/main/java/org/schabi/newpipe/player/resolver/PlaybackResolver.java @@ -1,8 +1,8 @@ package org.schabi.newpipe.player.resolver; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import com.google.android.exoplayer2.C; diff --git a/app/src/main/java/org/schabi/newpipe/player/resolver/Resolver.java b/app/src/main/java/org/schabi/newpipe/player/resolver/Resolver.java index 4bd79557498..d6af20ae2de 100644 --- a/app/src/main/java/org/schabi/newpipe/player/resolver/Resolver.java +++ b/app/src/main/java/org/schabi/newpipe/player/resolver/Resolver.java @@ -1,7 +1,7 @@ package org.schabi.newpipe.player.resolver; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; public interface Resolver { @Nullable Product resolve(@NonNull Source source); diff --git a/app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java b/app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java index 7abebc49e4c..c503fe5969e 100644 --- a/app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java +++ b/app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java @@ -2,8 +2,8 @@ import android.content.Context; import android.net.Uri; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import com.google.android.exoplayer2.Format; import com.google.android.exoplayer2.source.MediaSource; @@ -13,7 +13,6 @@ import org.schabi.newpipe.extractor.stream.SubtitlesStream; import org.schabi.newpipe.extractor.stream.AudioStream; import org.schabi.newpipe.extractor.stream.StreamInfo; -import org.schabi.newpipe.extractor.stream.SubtitlesStream; import org.schabi.newpipe.extractor.stream.VideoStream; import org.schabi.newpipe.player.helper.PlayerDataSource; import org.schabi.newpipe.player.helper.PlayerHelper; diff --git a/app/src/main/java/org/schabi/newpipe/report/AcraReportSender.java b/app/src/main/java/org/schabi/newpipe/report/AcraReportSender.java index a6a81474f1c..d8506fe6ec4 100644 --- a/app/src/main/java/org/schabi/newpipe/report/AcraReportSender.java +++ b/app/src/main/java/org/schabi/newpipe/report/AcraReportSender.java @@ -1,7 +1,7 @@ package org.schabi.newpipe.report; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.acra.collector.CrashReportData; import org.acra.sender.ReportSender; diff --git a/app/src/main/java/org/schabi/newpipe/report/AcraReportSenderFactory.java b/app/src/main/java/org/schabi/newpipe/report/AcraReportSenderFactory.java index 89f0ec614b4..94b2e84a5ab 100644 --- a/app/src/main/java/org/schabi/newpipe/report/AcraReportSenderFactory.java +++ b/app/src/main/java/org/schabi/newpipe/report/AcraReportSenderFactory.java @@ -1,7 +1,7 @@ package org.schabi.newpipe.report; import android.content.Context; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.acra.config.ACRAConfiguration; import org.acra.sender.ReportSender; diff --git a/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java index f852e013427..e7a6319e36a 100644 --- a/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java +++ b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java @@ -12,13 +12,13 @@ import android.os.Parcel; import android.os.Parcelable; import android.preference.PreferenceManager; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.design.widget.Snackbar; -import android.support.v4.app.NavUtils; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import com.google.android.material.snackbar.Snackbar; +import androidx.core.app.NavUtils; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; diff --git a/app/src/main/java/org/schabi/newpipe/settings/AppearanceSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/AppearanceSettingsFragment.java index 821636ee546..ce22b84e97d 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/AppearanceSettingsFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/AppearanceSettingsFragment.java @@ -4,8 +4,8 @@ import android.os.Build; import android.os.Bundle; import android.provider.Settings; -import android.support.annotation.Nullable; -import android.support.v7.preference.Preference; +import androidx.annotation.Nullable; +import androidx.preference.Preference; import org.schabi.newpipe.R; import org.schabi.newpipe.util.Constants; diff --git a/app/src/main/java/org/schabi/newpipe/settings/BasePreferenceFragment.java b/app/src/main/java/org/schabi/newpipe/settings/BasePreferenceFragment.java index e4fae3e1f2c..056e9942aa3 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/BasePreferenceFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/BasePreferenceFragment.java @@ -3,10 +3,10 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.annotation.Nullable; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.preference.PreferenceFragmentCompat; +import androidx.annotation.Nullable; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.preference.PreferenceFragmentCompat; import android.view.View; import org.schabi.newpipe.MainActivity; diff --git a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java index 82604f7da13..d05c23564a7 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java @@ -7,9 +7,9 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.preference.Preference; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.preference.Preference; import android.util.Log; import android.widget.Toast; @@ -274,7 +274,7 @@ else if (v instanceof Long) else if (v instanceof String) prefEdit.putString(key, ((String) v)); } - prefEdit.apply(); + prefEdit.commit(); } catch (FileNotFoundException e) { e.printStackTrace(); } catch (IOException e) { diff --git a/app/src/main/java/org/schabi/newpipe/settings/DebugSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/DebugSettingsFragment.java index 5f69593513c..9778002562a 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/DebugSettingsFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/DebugSettingsFragment.java @@ -3,10 +3,11 @@ import android.graphics.Color; import android.graphics.drawable.ColorDrawable; import android.os.Bundle; -import android.support.v7.app.AlertDialog; -import android.support.v7.preference.Preference; import android.widget.ListView; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.Preference; + import org.schabi.newpipe.R; import org.schabi.newpipe.notifications.scheduler.ScheduleLogger; diff --git a/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java index e671e4d3a93..8becc79a8d2 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/DownloadSettingsFragment.java @@ -8,9 +8,9 @@ import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v7.preference.Preference; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.preference.Preference; import android.util.Log; import android.widget.Toast; @@ -35,8 +35,7 @@ public class DownloadSettingsFragment extends BasePreferenceFragment { private String DOWNLOAD_PATH_VIDEO_PREFERENCE; private String DOWNLOAD_PATH_AUDIO_PREFERENCE; - - private String DOWNLOAD_STORAGE_ASK; + private String STORAGE_USE_SAF_PREFERENCE; private Preference prefPathVideo; private Preference prefPathAudio; @@ -50,21 +49,21 @@ public void onCreate(@Nullable Bundle savedInstanceState) { DOWNLOAD_PATH_VIDEO_PREFERENCE = getString(R.string.download_path_video_key); DOWNLOAD_PATH_AUDIO_PREFERENCE = getString(R.string.download_path_audio_key); - DOWNLOAD_STORAGE_ASK = getString(R.string.downloads_storage_ask); + STORAGE_USE_SAF_PREFERENCE = getString(R.string.storage_use_saf); + final String downloadStorageAsk = getString(R.string.downloads_storage_ask); prefPathVideo = findPreference(DOWNLOAD_PATH_VIDEO_PREFERENCE); prefPathAudio = findPreference(DOWNLOAD_PATH_AUDIO_PREFERENCE); - prefStorageAsk = findPreference(DOWNLOAD_STORAGE_ASK); + prefStorageAsk = findPreference(downloadStorageAsk); updatePreferencesSummary(); - updatePathPickers(!defaultPreferences.getBoolean(DOWNLOAD_STORAGE_ASK, false)); + updatePathPickers(!defaultPreferences.getBoolean(downloadStorageAsk, false)); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { prefStorageAsk.setSummary(R.string.downloads_storage_ask_summary); } if (hasInvalidPath(DOWNLOAD_PATH_VIDEO_PREFERENCE) || hasInvalidPath(DOWNLOAD_PATH_AUDIO_PREFERENCE)) { - Toast.makeText(ctx, R.string.download_pick_path, Toast.LENGTH_SHORT).show(); updatePreferencesSummary(); } @@ -173,7 +172,10 @@ public boolean onPreferenceTreeClick(Preference preference) { String key = preference.getKey(); int request; - if (key.equals(DOWNLOAD_PATH_VIDEO_PREFERENCE)) { + if (key.equals(STORAGE_USE_SAF_PREFERENCE)) { + Toast.makeText(getContext(), R.string.download_choose_new_path, Toast.LENGTH_LONG).show(); + return true; + } else if (key.equals(DOWNLOAD_PATH_VIDEO_PREFERENCE)) { request = REQUEST_DOWNLOAD_VIDEO_PATH; } else if (key.equals(DOWNLOAD_PATH_AUDIO_PREFERENCE)) { request = REQUEST_DOWNLOAD_AUDIO_PATH; @@ -182,7 +184,7 @@ public boolean onPreferenceTreeClick(Preference preference) { } Intent i; - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && NewPipeSettings.useStorageAccessFramework(ctx)) { i = new Intent(Intent.ACTION_OPEN_DOCUMENT_TREE) .putExtra("android.content.extra.SHOW_ADVANCED", true) .addFlags(Intent.FLAG_GRANT_PERSISTABLE_URI_PERMISSION | StoredDirectoryHelper.PERMISSION_FLAGS); @@ -223,16 +225,17 @@ else if (requestCode == REQUEST_DOWNLOAD_AUDIO_PATH) return; } - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { - // steps: - // 1. revoke permissions on the old save path - // 2. acquire permissions on the new save path - // 3. save the new path, if step(2) was successful - final Context ctx = getContext(); - if (ctx == null) throw new NullPointerException("getContext()"); - forgetSAFTree(ctx, defaultPreferences.getString(key, "")); + // revoke permissions on the old save path (required for SAF only) + final Context ctx = getContext(); + if (ctx == null) throw new NullPointerException("getContext()"); + + forgetSAFTree(ctx, defaultPreferences.getString(key, "")); + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP && !FilePickerActivityHelper.isOwnFileUri(ctx, uri)) { + // steps to acquire the selected path: + // 1. acquire permissions on the new save path + // 2. save the new path, if step(2) was successful try { ctx.grantUriPermission(ctx.getPackageName(), uri, StoredDirectoryHelper.PERMISSION_FLAGS); @@ -247,7 +250,7 @@ else if (requestCode == REQUEST_DOWNLOAD_AUDIO_PATH) return; } } else { - File target = Utils.getFileForUri(data.getData()); + File target = Utils.getFileForUri(uri); if (!target.canWrite()) { showMessageDialog(R.string.download_to_sdcard_error_title, R.string.download_to_sdcard_error_message); return; diff --git a/app/src/main/java/org/schabi/newpipe/settings/HistorySettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/HistorySettingsFragment.java index d28c3179c17..cdfbf54a7db 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/HistorySettingsFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/HistorySettingsFragment.java @@ -1,9 +1,9 @@ package org.schabi.newpipe.settings; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.app.AlertDialog; -import android.support.v7.preference.Preference; +import androidx.annotation.Nullable; +import androidx.appcompat.app.AlertDialog; +import androidx.preference.Preference; import android.widget.Toast; import org.schabi.newpipe.R; @@ -18,7 +18,8 @@ public class HistorySettingsFragment extends BasePreferenceFragment { private String cacheWipeKey; - private String viewsHistroyClearKey; + private String viewsHistoryClearKey; + private String playbackStatesClearKey; private String searchHistoryClearKey; private HistoryRecordManager recordManager; private CompositeDisposable disposables; @@ -27,7 +28,8 @@ public class HistorySettingsFragment extends BasePreferenceFragment { public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); cacheWipeKey = getString(R.string.metadata_cache_wipe_key); - viewsHistroyClearKey = getString(R.string.clear_views_history_key); + viewsHistoryClearKey = getString(R.string.clear_views_history_key); + playbackStatesClearKey = getString(R.string.clear_playback_states_key); searchHistoryClearKey = getString(R.string.clear_search_history_key); recordManager = new HistoryRecordManager(getActivity()); disposables = new CompositeDisposable(); @@ -46,16 +48,31 @@ public boolean onPreferenceTreeClick(Preference preference) { Toast.LENGTH_SHORT).show(); } - if (preference.getKey().equals(viewsHistroyClearKey)) { + if (preference.getKey().equals(viewsHistoryClearKey)) { new AlertDialog.Builder(getActivity()) .setTitle(R.string.delete_view_history_alert) .setNegativeButton(R.string.cancel, ((dialog, which) -> dialog.dismiss())) .setPositiveButton(R.string.delete, ((dialog, which) -> { + final Disposable onDeletePlaybackStates = recordManager.deleteCompelteStreamStateHistory() + .observeOn(AndroidSchedulers.mainThread()) + .subscribe( + howManyDeleted -> Toast.makeText(getActivity(), + R.string.watch_history_states_deleted, + Toast.LENGTH_SHORT).show(), + throwable -> ErrorActivity.reportError(getContext(), + throwable, + SettingsActivity.class, null, + ErrorActivity.ErrorInfo.make( + UserAction.DELETE_FROM_HISTORY, + "none", + "Delete playback states", + R.string.general_error))); + final Disposable onDelete = recordManager.deleteWholeStreamHistory() .observeOn(AndroidSchedulers.mainThread()) .subscribe( howManyDeleted -> Toast.makeText(getActivity(), - R.string.view_history_deleted, + R.string.watch_history_deleted, Toast.LENGTH_SHORT).show(), throwable -> ErrorActivity.reportError(getContext(), throwable, @@ -78,6 +95,7 @@ public boolean onPreferenceTreeClick(Preference preference) { "none", "Delete search history", R.string.general_error))); + disposables.add(onDeletePlaybackStates); disposables.add(onClearOrphans); disposables.add(onDelete); })) @@ -85,12 +103,39 @@ public boolean onPreferenceTreeClick(Preference preference) { .show(); } + if (preference.getKey().equals(playbackStatesClearKey)) { + new AlertDialog.Builder(getActivity()) + .setTitle(R.string.delete_playback_states_alert) + .setNegativeButton(R.string.cancel, ((dialog, which) -> dialog.dismiss())) + .setPositiveButton(R.string.delete, ((dialog, which) -> { + + final Disposable onDeletePlaybackStates = recordManager.deleteCompelteStreamStateHistory() + .observeOn(AndroidSchedulers.mainThread()) + .subscribe( + howManyDeleted -> Toast.makeText(getActivity(), + R.string.watch_history_states_deleted, + Toast.LENGTH_SHORT).show(), + throwable -> ErrorActivity.reportError(getContext(), + throwable, + SettingsActivity.class, null, + ErrorActivity.ErrorInfo.make( + UserAction.DELETE_FROM_HISTORY, + "none", + "Delete playback states", + R.string.general_error))); + + disposables.add(onDeletePlaybackStates); + })) + .create() + .show(); + } + if (preference.getKey().equals(searchHistoryClearKey)) { new AlertDialog.Builder(getActivity()) .setTitle(R.string.delete_search_history_alert) .setNegativeButton(R.string.cancel, ((dialog, which) -> dialog.dismiss())) .setPositiveButton(R.string.delete, ((dialog, which) -> { - final Disposable onDelete = recordManager.deleteWholeSearchHistory() + final Disposable onDelete = recordManager.deleteCompleteSearchHistory() .observeOn(AndroidSchedulers.mainThread()) .subscribe( howManyDeleted -> Toast.makeText(getActivity(), diff --git a/app/src/main/java/org/schabi/newpipe/settings/MainSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/MainSettingsFragment.java index 43270926e6f..70460509dd0 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/MainSettingsFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/MainSettingsFragment.java @@ -1,7 +1,7 @@ package org.schabi.newpipe.settings; import android.os.Bundle; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import org.schabi.newpipe.BuildConfig; import org.schabi.newpipe.CheckForNewAppVersionTask; diff --git a/app/src/main/java/org/schabi/newpipe/settings/NewPipeSettings.java b/app/src/main/java/org/schabi/newpipe/settings/NewPipeSettings.java index f18d90a9553..e0003ccaae5 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/NewPipeSettings.java +++ b/app/src/main/java/org/schabi/newpipe/settings/NewPipeSettings.java @@ -24,7 +24,7 @@ import android.content.SharedPreferences; import android.os.Environment; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.schabi.newpipe.R; @@ -90,11 +90,19 @@ private static void getDir(Context context, int keyID, String defaultDirectoryNa } @NonNull - private static File getDir(String defaultDirectoryName) { + public static File getDir(String defaultDirectoryName) { return new File(Environment.getExternalStorageDirectory(), defaultDirectoryName); } private static String getNewPipeChildFolderPathForDir(File dir) { return new File(dir, "NewPipe").toURI().toString(); } + + public static boolean useStorageAccessFramework(Context context) { + final String key = context.getString(R.string.storage_use_saf); + final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + + return prefs.getBoolean(key, false); + } + } diff --git a/app/src/main/java/org/schabi/newpipe/settings/NotificationsSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/NotificationsSettingsFragment.java index b3e96183594..5e54ec745d7 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/NotificationsSettingsFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/NotificationsSettingsFragment.java @@ -2,10 +2,12 @@ import android.app.Activity; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.design.widget.Snackbar; -import android.support.v4.content.ContextCompat; -import android.support.v7.preference.Preference; + +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; +import androidx.preference.Preference; + +import com.google.android.material.snackbar.Snackbar; import org.schabi.newpipe.BuildConfig; import org.schabi.newpipe.R; diff --git a/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java b/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java index 61bd4077e40..7064aec3319 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/SelectChannelFragment.java @@ -3,10 +3,10 @@ import android.app.Activity; import android.content.DialogInterface; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.DialogFragment; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.fragment.app.DialogFragment; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/org/schabi/newpipe/settings/SelectKioskFragment.java b/app/src/main/java/org/schabi/newpipe/settings/SelectKioskFragment.java index 8c3bd56e7ec..d97e4f1b767 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/SelectKioskFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/SelectKioskFragment.java @@ -3,10 +3,10 @@ import android.app.Activity; import android.content.DialogInterface; import android.os.Bundle; -import android.support.v4.app.DialogFragment; -import android.support.v4.content.ContextCompat; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.fragment.app.DialogFragment; +import androidx.core.content.ContextCompat; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -16,7 +16,6 @@ import org.schabi.newpipe.MainActivity; import org.schabi.newpipe.R; import org.schabi.newpipe.extractor.NewPipe; -import org.schabi.newpipe.extractor.ServiceList; import org.schabi.newpipe.extractor.StreamingService; import org.schabi.newpipe.report.ErrorActivity; import org.schabi.newpipe.report.UserAction; @@ -124,9 +123,6 @@ public SelectKioskAdapter() throws Exception { for(StreamingService service : NewPipe.getServices()) { - //TODO: Multi-service support - if (service.getServiceId() != ServiceList.YouTube.getServiceId() && !DEBUG) continue; - for(String kioskId : service.getKioskList().getAvailableKiosks()) { String name = String.format(getString(R.string.service_kiosk_string), service.getServiceInfo().getName(), diff --git a/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java index a8482e0ebe0..a3f218074dc 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java +++ b/app/src/main/java/org/schabi/newpipe/settings/SettingsActivity.java @@ -2,12 +2,12 @@ import android.content.Context; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.preference.Preference; -import android.support.v7.preference.PreferenceFragmentCompat; -import android.support.v7.widget.Toolbar; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.preference.Preference; +import androidx.preference.PreferenceFragmentCompat; +import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; diff --git a/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java index 76d887dd1ef..9a4d5954951 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/UpdateSettingsFragment.java @@ -1,10 +1,9 @@ package org.schabi.newpipe.settings; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v7.preference.Preference; +import androidx.annotation.Nullable; +import androidx.preference.Preference; -import org.schabi.newpipe.CheckForNewAppVersionTask; import org.schabi.newpipe.R; public class UpdateSettingsFragment extends BasePreferenceFragment { diff --git a/app/src/main/java/org/schabi/newpipe/settings/notifications/NotificationsChannelsConfigFragment.java b/app/src/main/java/org/schabi/newpipe/settings/notifications/NotificationsChannelsConfigFragment.java index cd925a46dd4..03e58d99dc3 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/notifications/NotificationsChannelsConfigFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/notifications/NotificationsChannelsConfigFragment.java @@ -1,14 +1,15 @@ package org.schabi.newpipe.settings.notifications; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.RecyclerView; + import org.schabi.newpipe.R; import org.schabi.newpipe.database.subscription.NotificationMode; import org.schabi.newpipe.database.subscription.SubscriptionEntity; diff --git a/app/src/main/java/org/schabi/newpipe/settings/notifications/NotificationsConfigAdapter.java b/app/src/main/java/org/schabi/newpipe/settings/notifications/NotificationsConfigAdapter.java index fd81e6a1b73..5b8c8634c8a 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/notifications/NotificationsConfigAdapter.java +++ b/app/src/main/java/org/schabi/newpipe/settings/notifications/NotificationsConfigAdapter.java @@ -2,16 +2,17 @@ import android.graphics.drawable.Animatable; import android.graphics.drawable.Drawable; -import android.support.annotation.NonNull; -import android.support.graphics.drawable.Animatable2Compat; -import android.support.graphics.drawable.AnimatedVectorDrawableCompat; -import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; +import androidx.vectordrawable.graphics.drawable.Animatable2Compat; +import androidx.vectordrawable.graphics.drawable.AnimatedVectorDrawableCompat; + import org.schabi.newpipe.R; import org.schabi.newpipe.database.subscription.NotificationMode; import org.schabi.newpipe.database.subscription.SubscriptionEntity; diff --git a/app/src/main/java/org/schabi/newpipe/settings/tabs/AddTabDialog.java b/app/src/main/java/org/schabi/newpipe/settings/tabs/AddTabDialog.java index 695f81ff553..b93ec91d032 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/tabs/AddTabDialog.java +++ b/app/src/main/java/org/schabi/newpipe/settings/tabs/AddTabDialog.java @@ -3,9 +3,9 @@ import android.app.AlertDialog; import android.content.Context; import android.content.DialogInterface; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.v7.widget.AppCompatImageView; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.appcompat.widget.AppCompatImageView; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java b/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java index b86f13d1452..67295d8a53d 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java +++ b/app/src/main/java/org/schabi/newpipe/settings/tabs/ChooseTabsFragment.java @@ -4,18 +4,18 @@ import android.app.Dialog; import android.content.Context; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.design.widget.FloatingActionButton; -import android.support.v4.app.Fragment; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AlertDialog; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.content.res.AppCompatResources; -import android.support.v7.widget.AppCompatImageView; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import androidx.fragment.app.Fragment; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.content.res.AppCompatResources; +import androidx.appcompat.widget.AppCompatImageView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.ItemTouchHelper; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; @@ -229,6 +229,12 @@ public ChooseTabListItem[] getAvailableTabs(Context context) { returnList.add(new ChooseTabListItem(tab.getTabId(), getString(R.string.channel_page_summary), tab.getTabIconRes(context))); break; + case DEFAULT_KIOSK: + if (!tabList.contains(tab)) { + returnList.add(new ChooseTabListItem(tab.getTabId(), "Default Kiosk", + ThemeHelper.resolveResourceIdFromAttr(context, R.attr.ic_hot))); + } + break; default: if (!tabList.contains(tab)) { returnList.add(new ChooseTabListItem(context, tab)); @@ -310,6 +316,9 @@ void bind(int position, TabViewHolder holder) { case CHANNEL: tabName = NewPipe.getNameOfService(((Tab.ChannelTab) tab).getChannelServiceId()) + "/" + tabName; break; + case DEFAULT_KIOSK: + tabName = "Default Kiosk"; + break; } diff --git a/app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java b/app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java index d7c249a3efd..64ba3683bf1 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java +++ b/app/src/main/java/org/schabi/newpipe/settings/tabs/Tab.java @@ -1,15 +1,18 @@ package org.schabi.newpipe.settings.tabs; import android.content.Context; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; import com.grack.nanojson.JsonObject; import com.grack.nanojson.JsonSink; +import org.jsoup.helper.StringUtil; +import org.schabi.newpipe.App; import org.schabi.newpipe.R; +import org.schabi.newpipe.extractor.NewPipe; import org.schabi.newpipe.extractor.exceptions.ExtractionException; import org.schabi.newpipe.fragments.BlankFragment; import org.schabi.newpipe.fragments.list.channel.ChannelFragment; @@ -19,6 +22,7 @@ import org.schabi.newpipe.local.history.StatisticsPlaylistFragment; import org.schabi.newpipe.local.subscription.SubscriptionFragment; import org.schabi.newpipe.util.KioskTranslator; +import org.schabi.newpipe.util.ServiceHelper; import org.schabi.newpipe.util.ThemeHelper; public abstract class Tab { @@ -111,6 +115,12 @@ private static Tab from(final int tabId, @Nullable JsonObject jsonObject) { return new KioskTab(jsonObject); case CHANNEL: return new ChannelTab(jsonObject); + case DEFAULT_KIOSK: + DefaultKioskTab tab = new DefaultKioskTab(); + if(!StringUtil.isBlank(tab.getKioskId())){ + return tab; + } + return null; } } @@ -128,7 +138,8 @@ public enum Type { BOOKMARKS(new BookmarksTab()), HISTORY(new HistoryTab()), KIOSK(new KioskTab()), - CHANNEL(new ChannelTab()); + CHANNEL(new ChannelTab()), + DEFAULT_KIOSK(new DefaultKioskTab()); private Tab tab; @@ -413,4 +424,55 @@ public String getChannelName() { return channelName; } } + + public static class DefaultKioskTab extends Tab { + public static final int ID = 7; + + private int kioskServiceId; + private String kioskId; + + protected DefaultKioskTab() { + initKiosk(); + } + + public void initKiosk() { + this.kioskServiceId = ServiceHelper.getSelectedServiceId(App.getApp()); + try { + this.kioskId = NewPipe.getService(this.kioskServiceId).getKioskList().getDefaultKioskId(); + } catch (ExtractionException e) { + this.kioskId = ""; + } + } + + @Override + public int getTabId() { + return ID; + } + + @Override + public String getTabName(Context context) { + return KioskTranslator.getTranslatedKioskName(kioskId, context); + } + + @DrawableRes + @Override + public int getTabIconRes(Context context) { + final int kioskIcon = KioskTranslator.getKioskIcons(kioskId, context); + + if (kioskIcon <= 0) { + throw new IllegalStateException("Kiosk ID is not valid: \"" + kioskId + "\""); + } + + return kioskIcon; + } + + @Override + public KioskFragment getFragment() throws ExtractionException { + return KioskFragment.getInstance(kioskServiceId, kioskId); + } + + public String getKioskId() { + return kioskId; + } + } } diff --git a/app/src/main/java/org/schabi/newpipe/settings/tabs/TabsJsonHelper.java b/app/src/main/java/org/schabi/newpipe/settings/tabs/TabsJsonHelper.java index 332e244c888..9553e47e192 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/tabs/TabsJsonHelper.java +++ b/app/src/main/java/org/schabi/newpipe/settings/tabs/TabsJsonHelper.java @@ -1,6 +1,6 @@ package org.schabi.newpipe.settings.tabs; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import com.grack.nanojson.JsonArray; import com.grack.nanojson.JsonObject; @@ -9,27 +9,18 @@ import com.grack.nanojson.JsonStringWriter; import com.grack.nanojson.JsonWriter; -import org.schabi.newpipe.settings.tabs.Tab.Type; +import org.jsoup.helper.StringUtil; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; -import static org.schabi.newpipe.extractor.ServiceList.YouTube; - /** * Class to get a JSON representation of a list of tabs, and the other way around. */ public class TabsJsonHelper { private static final String JSON_TABS_ARRAY_KEY = "tabs"; - protected static final List FALLBACK_INITIAL_TABS_LIST = Collections.unmodifiableList(Arrays.asList( - new Tab.KioskTab(YouTube.getServiceId(), "Trending"), - Type.SUBSCRIPTIONS.getTab(), - Type.BOOKMARKS.getTab() - )); - public static class InvalidJsonException extends Exception { private InvalidJsonException() { super(); @@ -48,7 +39,7 @@ private InvalidJsonException(Throwable cause) { * Try to reads the passed JSON and returns the list of tabs if no error were encountered. *

* If the JSON is null or empty, or the list of tabs that it represents is empty, the - * {@link #FALLBACK_INITIAL_TABS_LIST fallback list} will be returned. + * {@link #getDefaultTabs fallback list} will be returned. *

* Tabs with invalid ids (i.e. not in the {@link Tab.Type} enum) will be ignored. * @@ -58,7 +49,7 @@ private InvalidJsonException(Throwable cause) { */ public static List getTabsFromJson(@Nullable String tabsJson) throws InvalidJsonException { if (tabsJson == null || tabsJson.isEmpty()) { - return FALLBACK_INITIAL_TABS_LIST; + return getDefaultTabs(); } final List returnTabs = new ArrayList<>(); @@ -86,12 +77,22 @@ public static List getTabsFromJson(@Nullable String tabsJson) throws Invali } if (returnTabs.isEmpty()) { - return FALLBACK_INITIAL_TABS_LIST; + return getDefaultTabs(); } return returnTabs; } + public static List getDefaultTabs(){ + List tabs = new ArrayList<>(); + Tab.DefaultKioskTab tab = new Tab.DefaultKioskTab(); + if(!StringUtil.isBlank(tab.getKioskId())){ + tabs.add(tab); + } + tabs.add(Tab.Type.SUBSCRIPTIONS.getTab()); + tabs.add(Tab.Type.BOOKMARKS.getTab()); + return Collections.unmodifiableList(tabs); + } /** * Get a JSON representation from a list of tabs. * diff --git a/app/src/main/java/org/schabi/newpipe/settings/tabs/TabsManager.java b/app/src/main/java/org/schabi/newpipe/settings/tabs/TabsManager.java index a7d8dffa484..1c99775e564 100644 --- a/app/src/main/java/org/schabi/newpipe/settings/tabs/TabsManager.java +++ b/app/src/main/java/org/schabi/newpipe/settings/tabs/TabsManager.java @@ -44,7 +44,7 @@ public void resetTabs() { } public List getDefaultTabs() { - return TabsJsonHelper.FALLBACK_INITIAL_TABS_LIST; + return TabsJsonHelper.getDefaultTabs(); } /*////////////////////////////////////////////////////////////////////////// diff --git a/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java b/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java index 98261b0c96b..e5881fd0b6d 100644 --- a/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java +++ b/app/src/main/java/org/schabi/newpipe/streams/WebMWriter.java @@ -1,6 +1,6 @@ package org.schabi.newpipe.streams; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.schabi.newpipe.streams.WebMReader.Cluster; import org.schabi.newpipe.streams.WebMReader.Segment; diff --git a/app/src/main/java/org/schabi/newpipe/util/AnimationUtils.java b/app/src/main/java/org/schabi/newpipe/util/AnimationUtils.java index 6a398a8a28a..e47e1448365 100644 --- a/app/src/main/java/org/schabi/newpipe/util/AnimationUtils.java +++ b/app/src/main/java/org/schabi/newpipe/util/AnimationUtils.java @@ -24,10 +24,10 @@ import android.animation.ArgbEvaluator; import android.animation.ValueAnimator; import android.content.res.ColorStateList; -import android.support.annotation.ColorInt; -import android.support.annotation.FloatRange; -import android.support.v4.view.ViewCompat; -import android.support.v4.view.animation.FastOutSlowInInterpolator; +import androidx.annotation.ColorInt; +import androidx.annotation.FloatRange; +import androidx.core.view.ViewCompat; +import androidx.interpolator.view.animation.FastOutSlowInInterpolator; import android.util.Log; import android.view.View; import android.widget.TextView; diff --git a/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java b/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java index b70e5fdeffe..c4471942e22 100644 --- a/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java +++ b/app/src/main/java/org/schabi/newpipe/util/ExtractorHelper.java @@ -228,6 +228,10 @@ public static Maybe loadFromCache(final int serviceId, final }); } + public static boolean isCached(final int serviceId, final String url, InfoItem.InfoType infoType) { + return null != loadFromCache(serviceId, url, infoType).blockingGet(); + } + /** * A simple and general error handler that show a Toast for known exceptions, and for others, opens the report error activity with the (optional) error message. */ diff --git a/app/src/main/java/org/schabi/newpipe/util/FallbackViewHolder.java b/app/src/main/java/org/schabi/newpipe/util/FallbackViewHolder.java index f0cdfdf99ce..bfe0ae5c553 100644 --- a/app/src/main/java/org/schabi/newpipe/util/FallbackViewHolder.java +++ b/app/src/main/java/org/schabi/newpipe/util/FallbackViewHolder.java @@ -1,6 +1,6 @@ package org.schabi.newpipe.util; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; import android.view.View; public class FallbackViewHolder extends RecyclerView.ViewHolder { diff --git a/app/src/main/java/org/schabi/newpipe/util/FilePickerActivityHelper.java b/app/src/main/java/org/schabi/newpipe/util/FilePickerActivityHelper.java index 20554ce5937..420322c27b1 100644 --- a/app/src/main/java/org/schabi/newpipe/util/FilePickerActivityHelper.java +++ b/app/src/main/java/org/schabi/newpipe/util/FilePickerActivityHelper.java @@ -2,13 +2,14 @@ import android.content.Context; import android.content.Intent; +import android.net.Uri; import android.os.Bundle; import android.os.Environment; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.Loader; -import android.support.v7.util.SortedList; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.loader.content.Loader; +import androidx.recyclerview.widget.SortedList; +import androidx.recyclerview.widget.RecyclerView; import android.util.TypedValue; import android.view.LayoutInflater; import android.view.View; @@ -29,7 +30,7 @@ public class FilePickerActivityHelper extends com.nononsenseapps.filepicker.File @Override public void onCreate(Bundle savedInstanceState) { - if(ThemeHelper.isLightThemeSelected(this)) { + if (ThemeHelper.isLightThemeSelected(this)) { this.setTheme(R.style.FilePickerThemeLight); } else { this.setTheme(R.style.FilePickerThemeDark); @@ -73,6 +74,11 @@ public static Intent chooseFileToSave(@NonNull Context context, @Nullable String .putExtra(FilePickerActivityHelper.EXTRA_MODE, FilePickerActivityHelper.MODE_NEW_FILE); } + public static boolean isOwnFileUri(@NonNull Context context, @NonNull Uri uri) { + if (uri.getAuthority() == null) return false; + return uri.getAuthority().startsWith(context.getPackageName()); + } + /*////////////////////////////////////////////////////////////////////////// // Internal //////////////////////////////////////////////////////////////////////////*/ @@ -109,6 +115,12 @@ public void onClickOk(@NonNull View view) { super.onClickOk(view); } + @Override + protected boolean isItemVisible(@NonNull File file) { + if (file.isDirectory() && file.isHidden()) return true; + return super.isItemVisible(file); + } + public File getBackTop() { if (getArguments() == null) return Environment.getExternalStorageDirectory(); diff --git a/app/src/main/java/org/schabi/newpipe/util/InfoCache.java b/app/src/main/java/org/schabi/newpipe/util/InfoCache.java index 23b134281f3..afb7604c507 100644 --- a/app/src/main/java/org/schabi/newpipe/util/InfoCache.java +++ b/app/src/main/java/org/schabi/newpipe/util/InfoCache.java @@ -19,9 +19,9 @@ package org.schabi.newpipe.util; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.util.LruCache; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.collection.LruCache; import android.util.Log; import org.schabi.newpipe.MainActivity; diff --git a/app/src/main/java/org/schabi/newpipe/util/LayoutManagerSmoothScroller.java b/app/src/main/java/org/schabi/newpipe/util/LayoutManagerSmoothScroller.java index 9eca2d61064..df7549c47e9 100644 --- a/app/src/main/java/org/schabi/newpipe/util/LayoutManagerSmoothScroller.java +++ b/app/src/main/java/org/schabi/newpipe/util/LayoutManagerSmoothScroller.java @@ -2,9 +2,9 @@ import android.content.Context; import android.graphics.PointF; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.LinearSmoothScroller; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.LinearSmoothScroller; +import androidx.recyclerview.widget.RecyclerView; public class LayoutManagerSmoothScroller extends LinearLayoutManager { diff --git a/app/src/main/java/org/schabi/newpipe/util/ListHelper.java b/app/src/main/java/org/schabi/newpipe/util/ListHelper.java index fa5530f128c..eb950b1ed67 100644 --- a/app/src/main/java/org/schabi/newpipe/util/ListHelper.java +++ b/app/src/main/java/org/schabi/newpipe/util/ListHelper.java @@ -4,7 +4,7 @@ import android.content.SharedPreferences; import android.net.ConnectivityManager; import android.preference.PreferenceManager; -import android.support.annotation.StringRes; +import androidx.annotation.StringRes; import org.schabi.newpipe.R; import org.schabi.newpipe.extractor.MediaFormat; diff --git a/app/src/main/java/org/schabi/newpipe/util/Localization.java b/app/src/main/java/org/schabi/newpipe/util/Localization.java index eed1a8ae247..08c9c6d98f0 100644 --- a/app/src/main/java/org/schabi/newpipe/util/Localization.java +++ b/app/src/main/java/org/schabi/newpipe/util/Localization.java @@ -4,9 +4,9 @@ import android.content.SharedPreferences; import android.content.res.Resources; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.annotation.PluralsRes; -import android.support.annotation.StringRes; +import androidx.annotation.NonNull; +import androidx.annotation.PluralsRes; +import androidx.annotation.StringRes; import android.text.TextUtils; import org.schabi.newpipe.R; diff --git a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java index 22b9e2ee662..6b8b09c45ed 100644 --- a/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java +++ b/app/src/main/java/org/schabi/newpipe/util/NavigationHelper.java @@ -8,12 +8,12 @@ import android.net.Uri; import android.os.Build; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentTransaction; -import android.support.v7.app.AlertDialog; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentTransaction; +import androidx.appcompat.app.AlertDialog; import android.util.Log; import android.widget.Toast; diff --git a/app/src/main/java/org/schabi/newpipe/util/OnClickGesture.java b/app/src/main/java/org/schabi/newpipe/util/OnClickGesture.java index 01416b279cf..18f4f67f4cc 100644 --- a/app/src/main/java/org/schabi/newpipe/util/OnClickGesture.java +++ b/app/src/main/java/org/schabi/newpipe/util/OnClickGesture.java @@ -1,6 +1,6 @@ package org.schabi.newpipe.util; -import android.support.v7.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView; public abstract class OnClickGesture { diff --git a/app/src/main/java/org/schabi/newpipe/util/PermissionHelper.java b/app/src/main/java/org/schabi/newpipe/util/PermissionHelper.java index 7574a93045b..f32bb6587d0 100644 --- a/app/src/main/java/org/schabi/newpipe/util/PermissionHelper.java +++ b/app/src/main/java/org/schabi/newpipe/util/PermissionHelper.java @@ -8,9 +8,9 @@ import android.net.Uri; import android.os.Build; import android.provider.Settings; -import android.support.annotation.RequiresApi; -import android.support.v4.app.ActivityCompat; -import android.support.v4.content.ContextCompat; +import androidx.annotation.RequiresApi; +import androidx.core.app.ActivityCompat; +import androidx.core.content.ContextCompat; import android.view.Gravity; import android.widget.TextView; import android.widget.Toast; @@ -21,10 +21,9 @@ public class PermissionHelper { public static final int DOWNLOAD_DIALOG_REQUEST_CODE = 778; public static final int DOWNLOADS_REQUEST_CODE = 777; - public static boolean checkStoragePermissions(Activity activity, int requestCode) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) { - if(!checkReadStoragePermissions(activity, requestCode)) return false; + if (!checkReadStoragePermissions(activity, requestCode)) return false; } return checkWriteStoragePermissions(activity, requestCode); } @@ -92,7 +91,7 @@ public static boolean checkSystemAlertWindowPermission(Context context) { i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); context.startActivity(i); return false; - }else return true; + } else return true; } public static boolean isPopupEnabled(Context context) { diff --git a/app/src/main/java/org/schabi/newpipe/util/SecondaryStreamHelper.java b/app/src/main/java/org/schabi/newpipe/util/SecondaryStreamHelper.java index 7febfa05385..d2ebcd9f875 100644 --- a/app/src/main/java/org/schabi/newpipe/util/SecondaryStreamHelper.java +++ b/app/src/main/java/org/schabi/newpipe/util/SecondaryStreamHelper.java @@ -1,6 +1,6 @@ package org.schabi.newpipe.util; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.schabi.newpipe.extractor.MediaFormat; import org.schabi.newpipe.extractor.stream.AudioStream; diff --git a/app/src/main/java/org/schabi/newpipe/util/SerializedCache.java b/app/src/main/java/org/schabi/newpipe/util/SerializedCache.java index 02871aff570..7680daf482f 100644 --- a/app/src/main/java/org/schabi/newpipe/util/SerializedCache.java +++ b/app/src/main/java/org/schabi/newpipe/util/SerializedCache.java @@ -1,8 +1,8 @@ package org.schabi.newpipe.util; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.util.LruCache; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.collection.LruCache; import android.util.Log; import org.schabi.newpipe.MainActivity; diff --git a/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java b/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java index c6ce3fec793..27e2f84224d 100644 --- a/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java +++ b/app/src/main/java/org/schabi/newpipe/util/ServiceHelper.java @@ -2,8 +2,8 @@ import android.content.Context; import android.preference.PreferenceManager; -import android.support.annotation.DrawableRes; -import android.support.annotation.StringRes; +import androidx.annotation.DrawableRes; +import androidx.annotation.StringRes; import org.schabi.newpipe.R; import org.schabi.newpipe.extractor.NewPipe; diff --git a/app/src/main/java/org/schabi/newpipe/util/StateSaver.java b/app/src/main/java/org/schabi/newpipe/util/StateSaver.java index 3115862e042..fffa9e99fb7 100644 --- a/app/src/main/java/org/schabi/newpipe/util/StateSaver.java +++ b/app/src/main/java/org/schabi/newpipe/util/StateSaver.java @@ -24,8 +24,8 @@ import android.os.Bundle; import android.os.Parcel; import android.os.Parcelable; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import android.text.TextUtils; import android.util.Log; diff --git a/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java b/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java new file mode 100644 index 00000000000..b3ec4d14e04 --- /dev/null +++ b/app/src/main/java/org/schabi/newpipe/util/StreamDialogEntry.java @@ -0,0 +1,109 @@ +package org.schabi.newpipe.util; + +import android.content.Context; +import androidx.fragment.app.Fragment; + +import org.schabi.newpipe.R; +import org.schabi.newpipe.extractor.stream.StreamInfoItem; +import org.schabi.newpipe.local.dialog.PlaylistAppendDialog; +import org.schabi.newpipe.player.playqueue.SinglePlayQueue; + +import java.util.Collections; + +public enum StreamDialogEntry { + ////////////////////////////////////// + // enum values with DEFAULT actions // + ////////////////////////////////////// + + enqueue_on_background(R.string.enqueue_on_background, (fragment, item) -> + NavigationHelper.enqueueOnBackgroundPlayer(fragment.getContext(), new SinglePlayQueue(item), false)), + + enqueue_on_popup(R.string.enqueue_on_popup, (fragment, item) -> + NavigationHelper.enqueueOnPopupPlayer(fragment.getContext(), new SinglePlayQueue(item), false)), + + start_here_on_background(R.string.start_here_on_background, (fragment, item) -> + NavigationHelper.playOnBackgroundPlayer(fragment.getContext(), new SinglePlayQueue(item), true)), + + start_here_on_popup(R.string.start_here_on_popup, (fragment, item) -> + NavigationHelper.playOnPopupPlayer(fragment.getContext(), new SinglePlayQueue(item), true)), + + set_as_playlist_thumbnail(R.string.set_as_playlist_thumbnail, (fragment, item) -> {}), // has to be set manually + + delete(R.string.delete, (fragment, item) -> {}), // has to be set manually + + append_playlist(R.string.append_playlist, (fragment, item) -> { + if (fragment.getFragmentManager() != null) { + PlaylistAppendDialog.fromStreamInfoItems(Collections.singletonList(item)) + .show(fragment.getFragmentManager(), "StreamDialogEntry@append_playlist"); + }}), + + share(R.string.share, (fragment, item) -> + ShareUtils.shareUrl(fragment.getContext(), item.getName(), item.getUrl())); + + + /////////////// + // variables // + /////////////// + + public interface StreamDialogEntryAction { + void onClick(Fragment fragment, final StreamInfoItem infoItem); + } + + private final int resource; + private final StreamDialogEntryAction defaultAction; + private StreamDialogEntryAction customAction; + + private static StreamDialogEntry[] enabledEntries; + + + /////////////////////////////////////////////////////// + // non-static methods to initialize and edit entries // + /////////////////////////////////////////////////////// + + StreamDialogEntry(final int resource, StreamDialogEntryAction defaultAction) { + this.resource = resource; + this.defaultAction = defaultAction; + this.customAction = null; + } + + /** + * Can be used after {@link #setEnabledEntries(StreamDialogEntry...)} has been called + */ + public void setCustomAction(StreamDialogEntryAction action) { + this.customAction = action; + } + + + //////////////////////////////////////////////// + // static methods that act on enabled entries // + //////////////////////////////////////////////// + + /** + * To be called before using {@link #setCustomAction(StreamDialogEntryAction)} + */ + public static void setEnabledEntries(StreamDialogEntry... entries) { + // cleanup from last time StreamDialogEntry was used + for (StreamDialogEntry streamDialogEntry : values()) { + streamDialogEntry.customAction = null; + } + + enabledEntries = entries; + } + + public static String[] getCommands(Context context) { + String[] commands = new String[enabledEntries.length]; + for (int i = 0; i != enabledEntries.length; ++i) { + commands[i] = context.getResources().getString(enabledEntries[i].resource); + } + + return commands; + } + + public static void clickOn(int which, Fragment fragment, StreamInfoItem infoItem) { + if (enabledEntries[which].customAction == null) { + enabledEntries[which].defaultAction.onClick(fragment, infoItem); + } else { + enabledEntries[which].customAction.onClick(fragment, infoItem); + } + } +} diff --git a/app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java b/app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java index 0c7861e1629..661aa47c1ce 100644 --- a/app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java +++ b/app/src/main/java/org/schabi/newpipe/util/ThemeHelper.java @@ -22,9 +22,9 @@ import android.content.Context; import android.content.res.TypedArray; import android.preference.PreferenceManager; -import android.support.annotation.AttrRes; -import android.support.annotation.StyleRes; -import android.support.v4.content.ContextCompat; +import androidx.annotation.AttrRes; +import androidx.annotation.StyleRes; +import androidx.core.content.ContextCompat; import android.util.TypedValue; import android.view.ContextThemeWrapper; diff --git a/app/src/main/java/org/schabi/newpipe/views/AnimatedProgressBar.java b/app/src/main/java/org/schabi/newpipe/views/AnimatedProgressBar.java index fe3e0d7bcdf..03ab40db5a5 100644 --- a/app/src/main/java/org/schabi/newpipe/views/AnimatedProgressBar.java +++ b/app/src/main/java/org/schabi/newpipe/views/AnimatedProgressBar.java @@ -1,7 +1,7 @@ package org.schabi.newpipe.views; import android.content.Context; -import android.support.annotation.Nullable; +import androidx.annotation.Nullable; import android.util.AttributeSet; import android.view.animation.AccelerateDecelerateInterpolator; import android.view.animation.Animation; diff --git a/app/src/main/java/org/schabi/newpipe/views/CollapsibleView.java b/app/src/main/java/org/schabi/newpipe/views/CollapsibleView.java index 88d525625a4..38ca58cea97 100644 --- a/app/src/main/java/org/schabi/newpipe/views/CollapsibleView.java +++ b/app/src/main/java/org/schabi/newpipe/views/CollapsibleView.java @@ -23,9 +23,9 @@ import android.content.Context; import android.os.Build; import android.os.Parcelable; -import android.support.annotation.IntDef; -import android.support.annotation.Nullable; -import android.support.annotation.RequiresApi; +import androidx.annotation.IntDef; +import androidx.annotation.Nullable; +import androidx.annotation.RequiresApi; import android.util.AttributeSet; import android.util.Log; import android.widget.LinearLayout; diff --git a/app/src/main/java/us/shandian/giga/get/DownloadInitializer.java b/app/src/main/java/us/shandian/giga/get/DownloadInitializer.java index 5239c5bb70c..247faeb6d74 100644 --- a/app/src/main/java/us/shandian/giga/get/DownloadInitializer.java +++ b/app/src/main/java/us/shandian/giga/get/DownloadInitializer.java @@ -1,6 +1,6 @@ package us.shandian.giga.get; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import org.schabi.newpipe.streams.io.SharpStream; @@ -28,16 +28,24 @@ public class DownloadInitializer extends Thread { mConn = null; } + private static void safeClose(HttpURLConnection con) { + try { + con.getInputStream().close(); + } catch (Exception e) { + // nothing to do + } + } + @Override public void run() { if (mMission.current > 0) mMission.resetState(false, true, DownloadMission.ERROR_NOTHING); int retryCount = 0; + int httpCode = 204; + while (true) { try { - mMission.currentThreadCount = mMission.threadCount; - - if (mMission.blocks < 0 && mMission.current == 0) { + if (mMission.blocks == null && mMission.current == 0) { // calculate the whole size of the mission long finalLength = 0; long lowestSize = Long.MAX_VALUE; @@ -45,11 +53,16 @@ public void run() { for (int i = 0; i < mMission.urls.length && mMission.running; i++) { mConn = mMission.openConnection(mMission.urls[i], mId, -1, -1); mMission.establishConnection(mId, mConn); + safeClose(mConn); if (Thread.interrupted()) return; long length = Utility.getContentLength(mConn); - if (i == 0) mMission.length = length; + if (i == 0) { + httpCode = mConn.getResponseCode(); + mMission.length = length; + } + if (length > 0) finalLength += length; if (length < lowestSize) lowestSize = length; } @@ -70,24 +83,24 @@ public void run() { // ask for the current resource length mConn = mMission.openConnection(mId, -1, -1); mMission.establishConnection(mId, mConn); + safeClose(mConn); if (!mMission.running || Thread.interrupted()) return; + httpCode = mConn.getResponseCode(); mMission.length = Utility.getContentLength(mConn); } - if (mMission.length == 0 || mConn.getResponseCode() == 204) { + if (mMission.length == 0 || httpCode == 204) { mMission.notifyError(DownloadMission.ERROR_HTTP_NO_CONTENT, null); return; } // check for dynamic generated content if (mMission.length == -1 && mConn.getResponseCode() == 200) { - mMission.blocks = 0; + mMission.blocks = new int[0]; mMission.length = 0; - mMission.fallback = true; mMission.unknownLength = true; - mMission.currentThreadCount = 1; if (DEBUG) { Log.d(TAG, "falling back (unknown length)"); @@ -96,27 +109,21 @@ public void run() { // Open again mConn = mMission.openConnection(mId, mMission.length - 10, mMission.length); mMission.establishConnection(mId, mConn); + safeClose(mConn); if (!mMission.running || Thread.interrupted()) return; - synchronized (mMission.blockState) { + synchronized (mMission.LOCK) { if (mConn.getResponseCode() == 206) { - if (mMission.currentThreadCount > 1) { - mMission.blocks = mMission.length / DownloadMission.BLOCK_SIZE; - - if (mMission.currentThreadCount > mMission.blocks) { - mMission.currentThreadCount = (int) mMission.blocks; - } - if (mMission.currentThreadCount <= 0) { - mMission.currentThreadCount = 1; - } - if (mMission.blocks * DownloadMission.BLOCK_SIZE < mMission.length) { - mMission.blocks++; - } + + if (mMission.threadCount > 1) { + int count = (int) (mMission.length / DownloadMission.BLOCK_SIZE); + if ((count * DownloadMission.BLOCK_SIZE) < mMission.length) count++; + + mMission.blocks = new int[count]; } else { - // if one thread is solicited don't calculate blocks, is useless - mMission.blocks = 1; - mMission.fallback = true; + // if one thread is required don't calculate blocks, is useless + mMission.blocks = new int[0]; mMission.unknownLength = false; } @@ -125,20 +132,13 @@ public void run() { } } else { // Fallback to single thread - mMission.blocks = 0; - mMission.fallback = true; + mMission.blocks = new int[0]; mMission.unknownLength = false; - mMission.currentThreadCount = 1; if (DEBUG) { Log.d(TAG, "falling back due http response code = " + mConn.getResponseCode()); } } - - for (long i = 0; i < mMission.currentThreadCount; i++) { - mMission.threadBlockPositions.add(i); - mMission.threadBytePositions.add(0L); - } } if (!mMission.running || Thread.interrupted()) return; diff --git a/app/src/main/java/us/shandian/giga/get/DownloadMission.java b/app/src/main/java/us/shandian/giga/get/DownloadMission.java index b3e32a43cdf..57cd15e8c5b 100644 --- a/app/src/main/java/us/shandian/giga/get/DownloadMission.java +++ b/app/src/main/java/us/shandian/giga/get/DownloadMission.java @@ -1,7 +1,6 @@ package us.shandian.giga.get; import android.os.Handler; -import android.os.Message; import android.util.Log; import org.schabi.newpipe.Downloader; @@ -9,15 +8,14 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; +import java.io.Serializable; import java.net.ConnectException; import java.net.HttpURLConnection; import java.net.SocketTimeoutException; import java.net.URL; import java.net.UnknownHostException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; +import javax.annotation.Nullable; import javax.net.ssl.SSLException; import us.shandian.giga.io.StoredFileHelper; @@ -28,10 +26,13 @@ import static org.schabi.newpipe.BuildConfig.DEBUG; public class DownloadMission extends Mission { - private static final long serialVersionUID = 4L;// last bump: 27 march 2019 + private static final long serialVersionUID = 5L;// last bump: 30 june 2019 static final int BUFFER_SIZE = 64 * 1024; - final static int BLOCK_SIZE = 512 * 1024; + static final int BLOCK_SIZE = 512 * 1024; + + @SuppressWarnings("SpellCheckingInspection") + private static final String INSUFFICIENT_STORAGE = "ENOSPC"; private static final String TAG = "DownloadMission"; @@ -57,11 +58,6 @@ public class DownloadMission extends Mission { */ public String[] urls; - /** - * Number of blocks the size of {@link DownloadMission#BLOCK_SIZE} - */ - long blocks = -1; - /** * Number of bytes downloaded */ @@ -92,7 +88,7 @@ public class DownloadMission extends Mission { public Postprocessing psAlgorithm; /** - * The current resource to download, see {@code urls[current]} and {@code offsets[current]} + * The current resource to download, {@code urls[current]} and {@code offsets[current]} */ public int current; @@ -111,33 +107,42 @@ public class DownloadMission extends Mission { */ public long nearLength; + /** + * Download blocks, the size is multiple of {@link DownloadMission#BLOCK_SIZE}. + * Every entry (block) in this array holds an offset, used to resume the download. + * An block offset can be -1 if the block was downloaded successfully. + */ + int[] blocks; + + /** + * Download/File resume offset in fallback mode (if applicable) {@link DownloadRunnableFallback} + */ + long fallbackResumeOffset; + + /** + * Maximum of download threads running, chosen by the user + */ public int threadCount = 3; - boolean fallback; - private int finishCount; + + private transient int finishCount; public transient boolean running; public boolean enqueued; public int errCode = ERROR_NOTHING; - public Exception errObject = null; + public transient boolean recovered; public transient Handler mHandler; private transient boolean mWritingToFile; + private transient boolean[] blockAcquired; - @SuppressWarnings("UseSparseArrays")// LongSparseArray is not serializable - final HashMap blockState = new HashMap<>(); - final List threadBlockPositions = new ArrayList<>(); - final List threadBytePositions = new ArrayList<>(); + final Object LOCK = new Lock(); private transient boolean deleted; - int currentThreadCount; + public transient volatile Thread[] threads = new Thread[0]; private transient Thread init = null; - protected DownloadMission() { - - } - public DownloadMission(String[] urls, StoredFileHelper storage, char kind, Postprocessing psInstance) { if (urls == null) throw new NullPointerException("urls is null"); if (urls.length < 1) throw new IllegalArgumentException("urls is empty"); @@ -154,69 +159,40 @@ public DownloadMission(String[] urls, StoredFileHelper storage, char kind, Postp } } - private void checkBlock(long block) { - if (block < 0 || block >= blocks) { - throw new IllegalArgumentException("illegal block identifier"); - } - } - /** - * Check if a block is reserved + * Acquire a block * - * @param block the block identifier - * @return true if the block is reserved and false if otherwise - */ - boolean isBlockPreserved(long block) { - checkBlock(block); - //noinspection ConstantConditions - return blockState.containsKey(block) ? blockState.get(block) : false; - } - - void preserveBlock(long block) { - checkBlock(block); - synchronized (blockState) { - blockState.put(block, true); + * @return the block or {@code null} if no more blocks left + */ + @Nullable + Block acquireBlock() { + synchronized (LOCK) { + for (int i = 0; i < blockAcquired.length; i++) { + if (!blockAcquired[i] && blocks[i] >= 0) { + Block block = new Block(); + block.position = i; + block.done = blocks[i]; + + blockAcquired[i] = true; + return block; + } + } } - } - /** - * Set the block of the file - * - * @param threadId the identifier of the thread - * @param position the block of the thread - */ - void setBlockPosition(int threadId, long position) { - threadBlockPositions.set(threadId, position); + return null; } /** - * Get the block of a file + * Release an block * - * @param threadId the identifier of the thread - * @return the block for the thread + * @param position the index of the block + * @param done amount of bytes downloaded */ - long getBlockPosition(int threadId) { - return threadBlockPositions.get(threadId); - } - - /** - * Save the position of the desired thread - * - * @param threadId the identifier of the thread - * @param position the relative position in bytes or zero - */ - void setThreadBytePosition(int threadId, long position) { - threadBytePositions.set(threadId, position); - } - - /** - * Get position inside of the thread, where thread will be resumed - * - * @param threadId the identifier of the thread - * @return the relative position in bytes or zero - */ - long getThreadBytePosition(int threadId) { - return threadBytePositions.get(threadId); + void releaseBlock(int position, int done) { + synchronized (LOCK) { + blockAcquired[position] = false; + blocks[position] = done; + } } /** @@ -287,11 +263,7 @@ void establishConnection(int threadId, HttpURLConnection conn) throws IOExceptio private void notify(int what) { - Message m = new Message(); - m.what = what; - m.obj = this; - - mHandler.sendMessage(m); + mHandler.obtainMessage(what, this).sendToTarget(); } synchronized void notifyProgress(long deltaLen) { @@ -341,12 +313,11 @@ synchronized void notifyError(Exception err) { public synchronized void notifyError(int code, Exception err) { Log.e(TAG, "notifyError() code = " + code, err); - if (err instanceof IOException) { if (!storage.canWrite() || err.getMessage().contains("Permission denied")) { code = ERROR_PERMISSION_DENIED; err = null; - } else if (err.getMessage().contains("ENOSPC")) { + } else if (err.getMessage().contains(INSUFFICIENT_STORAGE)) { code = ERROR_INSUFFICIENT_STORAGE; err = null; } @@ -368,9 +339,13 @@ public synchronized void notifyError(int code, Exception err) { if (code < 500 || code > 599) enqueued = false; } - pause(); - notify(DownloadManagerService.MESSAGE_ERROR); + + if (running) { + running = false; + recovered = true; + if (threads != null) selfPause(); + } } synchronized void notifyFinished() { @@ -378,11 +353,11 @@ synchronized void notifyFinished() { finishCount++; - if (finishCount == currentThreadCount) { + if (blocks.length < 1 || threads == null || finishCount == threads.length) { if (errCode != ERROR_NOTHING) return; if (DEBUG) { - Log.d(TAG, "onFinish" + (current + 1) + "/" + urls.length); + Log.d(TAG, "onFinish: " + (current + 1) + "/" + urls.length); } if ((current + 1) < urls.length) { @@ -421,13 +396,14 @@ private void notifyPostProcessing(int state) { Log.d(TAG, action + " postprocessing on " + storage.getName()); - synchronized (blockState) { + synchronized (LOCK) { // don't return without fully write the current state psState = state; Utility.writeToFile(metadata, DownloadMission.this); } } + /** * Start downloading with multiple threads. */ @@ -436,45 +412,52 @@ public void start() { // ensure that the previous state is completely paused. joinForThread(init); - if (threads != null) + if (threads != null) { for (Thread thread : threads) joinForThread(thread); + threads = null; + } running = true; errCode = ERROR_NOTHING; - if (current >= urls.length && psAlgorithm != null) { - runAsync(1, () -> { - if (doPostprocessing()) { - running = false; - deleteThisFromFile(); - - notify(DownloadManagerService.MESSAGE_FINISHED); - } - }); + if (hasInvalidStorage()) { + notifyError(ERROR_FILE_CREATION, null); + return; + } + if (current >= urls.length) { + runAsync(1, this::notifyFinished); return; } - if (blocks < 0) { + if (blocks == null) { initializer(); return; } init = null; + finishCount = 0; + blockAcquired = new boolean[blocks.length]; - if (threads == null || threads.length < 1) { - threads = new Thread[currentThreadCount]; - } - - if (fallback) { + if (blocks.length < 1) { if (unknownLength) { done = 0; length = 0; } - threads[0] = runAsync(1, new DownloadRunnableFallback(this)); + threads = new Thread[]{runAsync(1, new DownloadRunnableFallback(this))}; } else { - for (int i = 0; i < currentThreadCount; i++) { + int remainingBlocks = 0; + for (int block : blocks) if (block >= 0) remainingBlocks++; + + if (remainingBlocks < 1) { + runAsync(1, this::notifyFinished); + return; + } + + threads = new Thread[Math.min(threadCount, remainingBlocks)]; + + for (int i = 0; i < threads.length; i++) { threads[i] = runAsync(i + 1, new DownloadRunnable(this, i)); } } @@ -483,7 +466,7 @@ public void start() { /** * Pause the mission */ - public synchronized void pause() { + public void pause() { if (!running) return; if (isPsRunning()) { @@ -496,38 +479,42 @@ public synchronized void pause() { running = false; recovered = true; - if (init != null && Thread.currentThread() != init && init.isAlive()) { + if (init != null && init.isAlive()) { + // NOTE: if start() method is running ¡will no have effect! init.interrupt(); - synchronized (blockState) { + synchronized (LOCK) { resetState(false, true, ERROR_NOTHING); } return; } - if (DEBUG && blocks == 0) { + if (DEBUG && unknownLength) { Log.w(TAG, "pausing a download that can not be resumed (range requests not allowed by the server)."); } - if (threads == null || Thread.currentThread().isInterrupted()) { + // check if the calling thread (alias UI thread) is interrupted + if (Thread.currentThread().isInterrupted()) { writeThisToFile(); return; } // wait for all threads are suspended before save the state - runAsync(-1, () -> { - try { - for (Thread thread : threads) { - if (thread.isAlive()) { - thread.interrupt(); - thread.join(5000); - } + if (threads != null) runAsync(-1, this::selfPause); + } + + private void selfPause() { + try { + for (Thread thread : threads) { + if (thread.isAlive()) { + thread.interrupt(); + thread.join(5000); } - } catch (Exception e) { - // nothing to do - } finally { - writeThisToFile(); } - }); + } catch (Exception e) { + // nothing to do + } finally { + writeThisToFile(); + } } /** @@ -553,16 +540,13 @@ public boolean delete() { */ public void resetState(boolean rollback, boolean persistChanges, int errorCode) { done = 0; - blocks = -1; errCode = errorCode; errObject = null; - fallback = false; unknownLength = false; - finishCount = 0; - threadBlockPositions.clear(); - threadBytePositions.clear(); - blockState.clear(); - threads = new Thread[0]; + threads = null; + fallbackResumeOffset = 0; + blocks = null; + blockAcquired = null; if (rollback) current = 0; @@ -572,7 +556,6 @@ public void resetState(boolean rollback, boolean persistChanges, int errorCode) private void initializer() { init = runAsync(DownloadInitializer.mId, new DownloadInitializer(this)); - } /** @@ -580,7 +563,7 @@ private void initializer() { * if no thread is already running. */ private void writeThisToFile() { - synchronized (blockState) { + synchronized (LOCK) { if (deleted) return; Utility.writeToFile(metadata, DownloadMission.this); } @@ -626,7 +609,7 @@ public boolean isPsRunning() { * @return true, otherwise, false */ public boolean isInitialized() { - return blocks >= 0; // DownloadMissionInitializer was executed + return blocks != null; // DownloadMissionInitializer was executed } /** @@ -683,7 +666,7 @@ public boolean hasInvalidStorage() { * @return {@code true} is this mission its "healthy", otherwise, {@code false} */ public boolean isCorrupt() { - return (isPsFailed() || errCode == ERROR_POSTPROCESSING_HOLD) || isFinished() || hasInvalidStorage(); + return (isPsFailed() || errCode == ERROR_POSTPROCESSING_HOLD) || isFinished(); } private boolean doPostprocessing() { @@ -727,7 +710,7 @@ private boolean doPostprocessing() { } private boolean deleteThisFromFile() { - synchronized (blockState) { + synchronized (LOCK) { return metadata.delete(); } } @@ -789,7 +772,7 @@ private void joinForThread(Thread thread) { static class HttpError extends Exception { - int statusCode; + final int statusCode; HttpError(int statusCode) { this.statusCode = statusCode; @@ -797,7 +780,16 @@ static class HttpError extends Exception { @Override public String getMessage() { - return "HTTP " + String.valueOf(statusCode); + return "HTTP " + statusCode; } } + + static class Block { + int position; + int done; + } + + private static class Lock implements Serializable { + // java.lang.Object cannot be used because is not serializable + } } diff --git a/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java b/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java index 4380c0c68d0..f5b9b06d482 100644 --- a/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java +++ b/app/src/main/java/us/shandian/giga/get/DownloadRunnable.java @@ -9,8 +9,11 @@ import java.net.HttpURLConnection; import java.nio.channels.ClosedByInterruptException; +import us.shandian.giga.get.DownloadMission.Block; + import static org.schabi.newpipe.BuildConfig.DEBUG; + /** * Runnable to download blocks of a file until the file is completely downloaded, * an error occurs or the process is stopped. @@ -29,19 +32,23 @@ public class DownloadRunnable extends Thread { mId = id; } + private void releaseBlock(Block block, long remain) { + // set the block offset to -1 if it is completed + mMission.releaseBlock(block.position, remain < 0 ? -1 : block.done); + } + @Override public void run() { - boolean retry = mMission.recovered; - long blockPosition = mMission.getBlockPosition(mId); + boolean retry = false; + Block block = null; + int retryCount = 0; if (DEBUG) { - Log.d(TAG, mId + ":default pos " + blockPosition); Log.d(TAG, mId + ":recovered: " + mMission.recovered); } SharpStream f; - InputStream is = null; try { f = mMission.storage.getStream(); @@ -50,98 +57,80 @@ public void run() { return; } - while (mMission.running && mMission.errCode == DownloadMission.ERROR_NOTHING && blockPosition < mMission.blocks) { - - if (DEBUG && retry) { - Log.d(TAG, mId + ":retry is true. Resuming at " + blockPosition); - } - - // Wait for an unblocked position - while (!retry && blockPosition < mMission.blocks && mMission.isBlockPreserved(blockPosition)) { - - if (DEBUG) { - Log.d(TAG, mId + ":position " + blockPosition + " preserved, passing"); - } - - blockPosition++; + while (mMission.running && mMission.errCode == DownloadMission.ERROR_NOTHING) { + if (!retry) { + block = mMission.acquireBlock(); } - retry = false; - - if (blockPosition >= mMission.blocks) { + if (block == null) { + if (DEBUG) Log.d(TAG, mId + ":no more blocks left, exiting"); break; } if (DEBUG) { - Log.d(TAG, mId + ":preserving position " + blockPosition); + if (retry) + Log.d(TAG, mId + ":retry block at position=" + block.position + " from the start"); + else + Log.d(TAG, mId + ":acquired block at position=" + block.position + " done=" + block.done); } - mMission.preserveBlock(blockPosition); - mMission.setBlockPosition(mId, blockPosition); - - long start = blockPosition * DownloadMission.BLOCK_SIZE; + long start = block.position * DownloadMission.BLOCK_SIZE; long end = start + DownloadMission.BLOCK_SIZE - 1; - long offset = mMission.getThreadBytePosition(mId); - start += offset; + start += block.done; if (end >= mMission.length) { end = mMission.length - 1; } - long total = 0; - try { mConn = mMission.openConnection(mId, start, end); mMission.establishConnection(mId, mConn); // check if the download can be resumed - if (mConn.getResponseCode() == 416 && offset > 0) { - retryCount--; + if (mConn.getResponseCode() == 416) { + if (block.done > 0) { + // try again from the start (of the block) + block.done = 0; + retry = true; + mConn.disconnect(); + continue; + } + throw new DownloadMission.HttpError(416); } + retry = false; + // The server may be ignoring the range request if (mConn.getResponseCode() != 206) { - mMission.notifyError(new DownloadMission.HttpError(mConn.getResponseCode())); - if (DEBUG) { Log.e(TAG, mId + ":Unsupported " + mConn.getResponseCode()); } - + mMission.notifyError(new DownloadMission.HttpError(mConn.getResponseCode())); break; } f.seek(mMission.offsets[mMission.current] + start); - is = mConn.getInputStream(); - - byte[] buf = new byte[DownloadMission.BUFFER_SIZE]; - int len; - - while (start < end && mMission.running && (len = is.read(buf, 0, buf.length)) != -1) { - f.write(buf, 0, len); - start += len; - total += len; - mMission.notifyProgress(len); + try (InputStream is = mConn.getInputStream()) { + byte[] buf = new byte[DownloadMission.BUFFER_SIZE]; + int len; + + // use always start <= end + // fixes a deadlock in DownloadRunnable because youtube is sending one byte alone after downloading 26MiB exactly + while (start <= end && mMission.running && (len = is.read(buf, 0, buf.length)) != -1) { + f.write(buf, 0, len); + start += len; + block.done += len; + mMission.notifyProgress(len); + } } if (DEBUG && mMission.running) { - Log.d(TAG, mId + ":position " + blockPosition + " finished, " + total + " bytes downloaded"); + Log.d(TAG, mId + ":position " + block.position + " stopped " + start + "/" + end); } - - if (mMission.running) - mMission.setThreadBytePosition(mId, 0L);// clear byte position for next block - else - mMission.setThreadBytePosition(mId, total);// download paused, save progress for this block - } catch (Exception e) { - if (DEBUG) { - Log.d(TAG, mId + ": position=" + blockPosition + " total=" + total + " stopped due exception", e); - } - - mMission.setThreadBytePosition(mId, total); - if (!mMission.running || e instanceof ClosedByInterruptException) break; if (retryCount++ >= mMission.maxRetry) { @@ -150,15 +139,11 @@ public void run() { } retry = true; + } finally { + if (!retry) releaseBlock(block, end - start); } } - try { - if (is != null) is.close(); - } catch (Exception err) { - // nothing to do - } - try { f.close(); } catch (Exception err) { diff --git a/app/src/main/java/us/shandian/giga/get/DownloadRunnableFallback.java b/app/src/main/java/us/shandian/giga/get/DownloadRunnableFallback.java index d7ff208ce8e..7fb1f0c77b5 100644 --- a/app/src/main/java/us/shandian/giga/get/DownloadRunnableFallback.java +++ b/app/src/main/java/us/shandian/giga/get/DownloadRunnableFallback.java @@ -1,6 +1,6 @@ package us.shandian.giga.get; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import org.schabi.newpipe.streams.io.SharpStream; @@ -41,17 +41,25 @@ private void dispose() { if (mF != null) mF.close(); } + private long loadPosition() { + synchronized (mMission.LOCK) { + return mMission.fallbackResumeOffset; + } + } + + private void savePosition(long position) { + synchronized (mMission.LOCK) { + mMission.fallbackResumeOffset = position; + } + } + @Override public void run() { boolean done; + long start = loadPosition(); - long start = 0; - - if (!mMission.unknownLength) { - start = mMission.getThreadBytePosition(0); - if (DEBUG && start > 0) { - Log.i(TAG, "Resuming a single-thread download at " + start); - } + if (DEBUG && !mMission.unknownLength && start > 0) { + Log.i(TAG, "Resuming a single-thread download at " + start); } try { @@ -86,13 +94,12 @@ public void run() { mMission.notifyProgress(len); } - // if thread goes interrupted check if the last part mIs written. This avoid re-download the whole file + // if thread goes interrupted check if the last part is written. This avoid re-download the whole file done = len == -1; } catch (Exception e) { dispose(); - // save position - mMission.setThreadBytePosition(0, start); + savePosition(start); if (!mMission.running || e instanceof ClosedByInterruptException) return; @@ -114,7 +121,7 @@ public void run() { if (done) { mMission.notifyFinished(); } else { - mMission.setThreadBytePosition(0, start); + savePosition(start); } } diff --git a/app/src/main/java/us/shandian/giga/get/FinishedMission.java b/app/src/main/java/us/shandian/giga/get/FinishedMission.java index 2a01896fed9..b468f3c764a 100644 --- a/app/src/main/java/us/shandian/giga/get/FinishedMission.java +++ b/app/src/main/java/us/shandian/giga/get/FinishedMission.java @@ -1,6 +1,6 @@ package us.shandian.giga.get; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; public class FinishedMission extends Mission { diff --git a/app/src/main/java/us/shandian/giga/get/Mission.java b/app/src/main/java/us/shandian/giga/get/Mission.java index a9ed08fc20b..8e814a2aff5 100644 --- a/app/src/main/java/us/shandian/giga/get/Mission.java +++ b/app/src/main/java/us/shandian/giga/get/Mission.java @@ -1,6 +1,6 @@ package us.shandian.giga.get; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.io.Serializable; import java.util.Calendar; diff --git a/app/src/main/java/us/shandian/giga/get/sqlite/FinishedMissionStore.java b/app/src/main/java/us/shandian/giga/get/sqlite/FinishedMissionStore.java index 4650f75d075..1fa987c8845 100644 --- a/app/src/main/java/us/shandian/giga/get/sqlite/FinishedMissionStore.java +++ b/app/src/main/java/us/shandian/giga/get/sqlite/FinishedMissionStore.java @@ -6,7 +6,7 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import java.io.File; diff --git a/app/src/main/java/us/shandian/giga/io/CircularFileWriter.java b/app/src/main/java/us/shandian/giga/io/CircularFileWriter.java index f9ceca6ad45..e2afb920257 100644 --- a/app/src/main/java/us/shandian/giga/io/CircularFileWriter.java +++ b/app/src/main/java/us/shandian/giga/io/CircularFileWriter.java @@ -1,6 +1,6 @@ package us.shandian.giga.io; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.schabi.newpipe.streams.io.SharpStream; diff --git a/app/src/main/java/us/shandian/giga/io/FileStream.java b/app/src/main/java/us/shandian/giga/io/FileStream.java index 5b2033324b7..2cc4d5db8be 100644 --- a/app/src/main/java/us/shandian/giga/io/FileStream.java +++ b/app/src/main/java/us/shandian/giga/io/FileStream.java @@ -1,6 +1,6 @@ package us.shandian.giga.io; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.schabi.newpipe.streams.io.SharpStream; diff --git a/app/src/main/java/us/shandian/giga/io/FileStreamSAF.java b/app/src/main/java/us/shandian/giga/io/FileStreamSAF.java index ec662926822..fc716b4f93a 100644 --- a/app/src/main/java/us/shandian/giga/io/FileStreamSAF.java +++ b/app/src/main/java/us/shandian/giga/io/FileStreamSAF.java @@ -3,7 +3,7 @@ import android.content.ContentResolver; import android.net.Uri; import android.os.ParcelFileDescriptor; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import org.schabi.newpipe.streams.io.SharpStream; diff --git a/app/src/main/java/us/shandian/giga/io/SharpInputStream.java b/app/src/main/java/us/shandian/giga/io/SharpInputStream.java index 089101dfef5..0d6320b53e4 100644 --- a/app/src/main/java/us/shandian/giga/io/SharpInputStream.java +++ b/app/src/main/java/us/shandian/giga/io/SharpInputStream.java @@ -5,7 +5,7 @@ */ package us.shandian.giga.io; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import org.schabi.newpipe.streams.io.SharpStream; diff --git a/app/src/main/java/us/shandian/giga/io/StoredDirectoryHelper.java b/app/src/main/java/us/shandian/giga/io/StoredDirectoryHelper.java index aeb81047994..c1a63bb6adb 100644 --- a/app/src/main/java/us/shandian/giga/io/StoredDirectoryHelper.java +++ b/app/src/main/java/us/shandian/giga/io/StoredDirectoryHelper.java @@ -8,9 +8,9 @@ import android.net.Uri; import android.os.Build; import android.provider.DocumentsContract; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.provider.DocumentFile; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.documentfile.provider.DocumentFile; import java.io.File; import java.io.IOException; @@ -244,7 +244,7 @@ private static String makeFileName(String name, int idx, String ext) { * @param context The context * @param tree Directory where search * @param filename Target filename - * @return A {@link android.support.v4.provider.DocumentFile} contain the reference, otherwise, null + * @return A {@link DocumentFile} contain the reference, otherwise, null */ static DocumentFile findFileSAFHelper(@Nullable Context context, DocumentFile tree, String filename) { if (context == null || Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) { diff --git a/app/src/main/java/us/shandian/giga/io/StoredFileHelper.java b/app/src/main/java/us/shandian/giga/io/StoredFileHelper.java index f90a756a9c1..463c3ce5f47 100644 --- a/app/src/main/java/us/shandian/giga/io/StoredFileHelper.java +++ b/app/src/main/java/us/shandian/giga/io/StoredFileHelper.java @@ -7,10 +7,10 @@ import android.net.Uri; import android.os.Build; import android.provider.DocumentsContract; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.provider.DocumentFile; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.documentfile.provider.DocumentFile; import org.schabi.newpipe.streams.io.SharpStream; @@ -251,6 +251,7 @@ public String getTag() { public boolean existsAsFile() { if (source == null) return false; + // WARNING: DocumentFile.exists() and DocumentFile.isFile() methods are slow boolean exists = docFile == null ? ioFile.exists() : docFile.exists(); boolean isFile = docFile == null ? ioFile.isFile() : docFile.isFile();// ¿docFile.isVirtual() means is no-physical? diff --git a/app/src/main/java/us/shandian/giga/postprocessing/Postprocessing.java b/app/src/main/java/us/shandian/giga/postprocessing/Postprocessing.java index 15c4f575dad..22cc325d53c 100644 --- a/app/src/main/java/us/shandian/giga/postprocessing/Postprocessing.java +++ b/app/src/main/java/us/shandian/giga/postprocessing/Postprocessing.java @@ -1,7 +1,7 @@ package us.shandian.giga.postprocessing; import android.os.Message; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.util.Log; import org.schabi.newpipe.streams.io.SharpStream; diff --git a/app/src/main/java/us/shandian/giga/service/DownloadManager.java b/app/src/main/java/us/shandian/giga/service/DownloadManager.java index c2bba73966c..3d34411b9e2 100644 --- a/app/src/main/java/us/shandian/giga/service/DownloadManager.java +++ b/app/src/main/java/us/shandian/giga/service/DownloadManager.java @@ -2,9 +2,9 @@ import android.content.Context; import android.os.Handler; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v7.util.DiffUtil; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.recyclerview.widget.DiffUtil; import android.util.Log; import android.widget.Toast; @@ -35,8 +35,8 @@ enum NetworkState {Unavailable, Operating, MeteredOperating} public final static int SPECIAL_PENDING = 1; public final static int SPECIAL_FINISHED = 2; - static final String TAG_AUDIO = "audio"; - static final String TAG_VIDEO = "video"; + public static final String TAG_AUDIO = "audio"; + public static final String TAG_VIDEO = "video"; private final FinishedMissionStore mFinishedMissionStore; @@ -424,10 +424,12 @@ boolean runMissions() { boolean flag = false; for (DownloadMission mission : mMissionsPending) { - if (mission.running || !mission.enqueued || mission.isFinished() || mission.hasInvalidStorage()) + if (mission.running || !mission.enqueued || mission.isFinished()) continue; resumeMission(mission); + if (mission.errCode != DownloadMission.ERROR_NOTHING) continue; + if (mPrefQueueLimit) return true; flag = true; } @@ -666,9 +668,9 @@ public boolean[] hasValidPendingMissions() { continue; if (mission.running) - paused = true; - else running = true; + else + paused = true; } } diff --git a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java index 7f3a4bde1c7..461787b624b 100755 --- a/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java +++ b/app/src/main/java/us/shandian/giga/service/DownloadManagerService.java @@ -1,7 +1,5 @@ package us.shandian.giga.service; -import android.Manifest; -import android.app.AlertDialog; import android.app.Notification; import android.app.NotificationManager; import android.app.PendingIntent; @@ -11,6 +9,7 @@ import android.content.Intent; import android.content.IntentFilter; import android.content.SharedPreferences; +import android.content.SharedPreferences.OnSharedPreferenceChangeListener; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.net.ConnectivityManager; @@ -21,16 +20,15 @@ import android.os.Binder; import android.os.Build; import android.os.Handler; +import android.os.Handler.Callback; import android.os.IBinder; -import android.os.Looper; import android.os.Message; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.app.NotificationCompat; -import android.support.v4.app.NotificationCompat.Builder; -import android.support.v4.content.PermissionChecker; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.core.app.NotificationCompat; +import androidx.core.app.NotificationCompat.Builder; import android.util.Log; import android.util.SparseArray; import android.widget.Toast; @@ -91,14 +89,14 @@ public class DownloadManagerService extends Service { private Builder downloadDoneNotification = null; private StringBuilder downloadDoneList = null; - private final ArrayList mEchoObservers = new ArrayList<>(1); + private final ArrayList mEchoObservers = new ArrayList<>(1); private ConnectivityManager mConnectivityManager; private BroadcastReceiver mNetworkStateListener = null; private ConnectivityManager.NetworkCallback mNetworkStateListenerL = null; private SharedPreferences mPrefs = null; - private final SharedPreferences.OnSharedPreferenceChangeListener mPrefChangeListener = this::handlePreferenceChange; + private final OnSharedPreferenceChangeListener mPrefChangeListener = this::handlePreferenceChange; private boolean mLockAcquired = false; private LockManager mLock = null; @@ -131,12 +129,7 @@ public void onCreate() { } mBinder = new DownloadManagerBinder(); - mHandler = new Handler(Looper.myLooper()) { - @Override - public void handleMessage(Message msg) { - DownloadManagerService.this.handleMessage(msg); - } - }; + mHandler = new Handler(this::handleMessage); mPrefs = PreferenceManager.getDefaultSharedPreferences(this); @@ -257,23 +250,25 @@ public void onDestroy() { @Override public IBinder onBind(Intent intent) { + /* int permissionCheck; -// if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) { -// permissionCheck = PermissionChecker.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE); -// if (permissionCheck == PermissionChecker.PERMISSION_DENIED) { -// Toast.makeText(this, "Permission denied (read)", Toast.LENGTH_SHORT).show(); -// } -// } + if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.JELLY_BEAN) { + permissionCheck = PermissionChecker.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE); + if (permissionCheck == PermissionChecker.PERMISSION_DENIED) { + Toast.makeText(this, "Permission denied (read)", Toast.LENGTH_SHORT).show(); + } + } permissionCheck = PermissionChecker.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE); if (permissionCheck == PermissionChecker.PERMISSION_DENIED) { Toast.makeText(this, "Permission denied (write)", Toast.LENGTH_SHORT).show(); } + */ return mBinder; } - public void handleMessage(Message msg) { + private boolean handleMessage(@NonNull Message msg) { DownloadMission mission = (DownloadMission) msg.obj; switch (msg.what) { @@ -301,14 +296,12 @@ public void handleMessage(Message msg) { mFailedDownloads.delete(mFailedDownloads.indexOfValue(mission)); synchronized (mEchoObservers) { - for (Handler handler : mEchoObservers) { - Message echo = new Message(); - echo.what = msg.what; - echo.obj = msg.obj; - - handler.sendMessage(echo); + for (Callback observer : mEchoObservers) { + observer.handleMessage(msg); } } + + return true; } private void handleConnectivityState(boolean updateOnly) { @@ -516,7 +509,7 @@ private PendingIntent makePendingIntent(String action) { return PendingIntent.getService(this, intent.hashCode(), intent, PendingIntent.FLAG_UPDATE_CURRENT); } - private void manageObservers(Handler handler, boolean add) { + private void manageObservers(Callback handler, boolean add) { synchronized (mEchoObservers) { if (add) { mEchoObservers.add(handler); @@ -597,11 +590,11 @@ public boolean askForSavePath() { ); } - public void addMissionEventListener(Handler handler) { + public void addMissionEventListener(Callback handler) { manageObservers(handler, true); } - public void removeMissionEventListener(Handler handler) { + public void removeMissionEventListener(Callback handler) { manageObservers(handler, false); } diff --git a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java index 21cae18352d..6d11690318a 100644 --- a/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java +++ b/app/src/main/java/us/shandian/giga/ui/adapter/MissionAdapter.java @@ -9,18 +9,17 @@ import android.os.AsyncTask; import android.os.Build; import android.os.Handler; -import android.os.Looper; import android.os.Message; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.annotation.StringRes; -import android.support.v4.content.FileProvider; -import android.support.v4.view.ViewCompat; -import android.support.v7.app.AlertDialog; -import android.support.v7.util.DiffUtil; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.RecyclerView.Adapter; -import android.support.v7.widget.RecyclerView.ViewHolder; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.core.content.FileProvider; +import androidx.core.view.ViewCompat; +import androidx.appcompat.app.AlertDialog; +import androidx.recyclerview.widget.DiffUtil; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.RecyclerView.Adapter; +import androidx.recyclerview.widget.RecyclerView.ViewHolder; import android.util.Log; import android.util.SparseArray; import android.view.HapticFeedbackConstants; @@ -77,7 +76,7 @@ import static us.shandian.giga.get.DownloadMission.ERROR_UNKNOWN_EXCEPTION; import static us.shandian.giga.get.DownloadMission.ERROR_UNKNOWN_HOST; -public class MissionAdapter extends Adapter { +public class MissionAdapter extends Adapter implements Handler.Callback { private static final SparseArray ALGORITHMS = new SparseArray<>(); private static final String TAG = "MissionAdapter"; private static final String UNDEFINED_PROGRESS = "--.-%"; @@ -111,27 +110,7 @@ public MissionAdapter(Context context, @NonNull DownloadManager downloadManager, mInflater = (LayoutInflater) mContext.getSystemService(Context.LAYOUT_INFLATER_SERVICE); mLayout = R.layout.mission_item; - mHandler = new Handler(Looper.myLooper()) { - @Override - public void handleMessage(Message msg) { - switch (msg.what) { - case DownloadManagerService.MESSAGE_PROGRESS: - case DownloadManagerService.MESSAGE_ERROR: - case DownloadManagerService.MESSAGE_FINISHED: - onServiceMessage(msg); - break; - } - - if (mStartButton != null && mPauseButton != null) switch (msg.what) { - case DownloadManagerService.MESSAGE_DELETED: - case DownloadManagerService.MESSAGE_ERROR: - case DownloadManagerService.MESSAGE_FINISHED: - case DownloadManagerService.MESSAGE_PAUSED: - checkMasterButtonsVisibility(); - break; - } - } - }; + mHandler = new Handler(context.getMainLooper()); mEmptyMessage = emptyMessage; @@ -163,8 +142,7 @@ public void onViewRecycled(@NonNull ViewHolder view) { mPendingDownloadsItems.remove(h); if (mPendingDownloadsItems.size() < 1) { setAutoRefresh(false); - if (mStartButton != null) mStartButton.setVisible(false); - if (mPauseButton != null) mPauseButton.setVisible(false); + checkMasterButtonsVisibility(); } } @@ -410,29 +388,40 @@ private boolean checkInvalidFile(@NonNull Mission mission) { return true; } - public Handler getMessenger() { - return mHandler; - } + @Override + public boolean handleMessage(@NonNull Message msg) { + if (mStartButton != null && mPauseButton != null) { + checkMasterButtonsVisibility(); + } + + switch (msg.what) { + case DownloadManagerService.MESSAGE_PROGRESS: + case DownloadManagerService.MESSAGE_ERROR: + case DownloadManagerService.MESSAGE_FINISHED: + break; + default: + return false; + } - private void onServiceMessage(@NonNull Message msg) { if (msg.what == DownloadManagerService.MESSAGE_PROGRESS) { setAutoRefresh(true); - return; + return true; } - for (int i = 0; i < mPendingDownloadsItems.size(); i++) { - ViewHolderItem h = mPendingDownloadsItems.get(i); + for (ViewHolderItem h : mPendingDownloadsItems) { if (h.item.mission != msg.obj) continue; if (msg.what == DownloadManagerService.MESSAGE_FINISHED) { // DownloadManager should mark the download as finished applyChanges(); - return; + return true; } updateProgress(h); - return; + return true; } + + return false; } private void showError(@NonNull DownloadMission mission) { @@ -540,6 +529,8 @@ public void clearFinishedDownloads() { } private boolean handlePopupItem(@NonNull ViewHolderItem h, @NonNull MenuItem option) { + if (h.item == null) return true; + int id = option.getItemId(); DownloadMission mission = h.item.mission instanceof DownloadMission ? (DownloadMission) h.item.mission : null; @@ -568,16 +559,15 @@ private boolean handlePopupItem(@NonNull ViewHolderItem h, @NonNull MenuItem opt updateProgress(h); return true; case R.id.retry: - if (mission.hasInvalidStorage()) { + if (mission.isPsRunning()) { + mission.psContinue(true); + } else { mDownloadManager.tryRecover(mission); if (mission.storage.isInvalid()) mRecover.tryRecover(mission); else recoverMission(mission); - - return true; } - mission.psContinue(true); return true; case R.id.cancel: mission.psContinue(false); @@ -662,11 +652,15 @@ private void checkEmptyMessageVisibility() { if (mEmptyMessage.getVisibility() != flag) mEmptyMessage.setVisibility(flag); } - private void checkMasterButtonsVisibility() { + public void checkMasterButtonsVisibility() { boolean[] state = mIterator.hasValidPendingMissions(); + setButtonVisible(mPauseButton, state[0]); + setButtonVisible(mStartButton, state[1]); + } - mStartButton.setVisible(state[0]); - mPauseButton.setVisible(state[1]); + private static void setButtonVisible(MenuItem button, boolean visible) { + if (button.isVisible() != visible) + button.setVisible(visible); } public void ensurePausedMissions() { diff --git a/app/src/main/java/us/shandian/giga/ui/common/Deleter.java b/app/src/main/java/us/shandian/giga/ui/common/Deleter.java index 573bead9440..81b4e33e8e3 100644 --- a/app/src/main/java/us/shandian/giga/ui/common/Deleter.java +++ b/app/src/main/java/us/shandian/giga/ui/common/Deleter.java @@ -4,7 +4,7 @@ import android.content.Intent; import android.graphics.Color; import android.os.Handler; -import android.support.design.widget.Snackbar; +import com.google.android.material.snackbar.Snackbar; import android.view.View; import org.schabi.newpipe.R; diff --git a/app/src/main/java/us/shandian/giga/ui/common/ProgressDrawable.java b/app/src/main/java/us/shandian/giga/ui/common/ProgressDrawable.java index 33eba22eb2a..a0ff24aaaf1 100644 --- a/app/src/main/java/us/shandian/giga/ui/common/ProgressDrawable.java +++ b/app/src/main/java/us/shandian/giga/ui/common/ProgressDrawable.java @@ -9,8 +9,8 @@ import android.graphics.drawable.Drawable; import android.os.Handler; import android.os.Looper; -import android.support.annotation.ColorInt; -import android.support.annotation.NonNull; +import androidx.annotation.ColorInt; +import androidx.annotation.NonNull; public class ProgressDrawable extends Drawable { private static final int MARQUEE_INTERVAL = 150; diff --git a/app/src/main/java/us/shandian/giga/ui/common/ToolbarActivity.java b/app/src/main/java/us/shandian/giga/ui/common/ToolbarActivity.java index 6a04db5cdb1..2ba091573f9 100644 --- a/app/src/main/java/us/shandian/giga/ui/common/ToolbarActivity.java +++ b/app/src/main/java/us/shandian/giga/ui/common/ToolbarActivity.java @@ -1,8 +1,8 @@ package us.shandian.giga.ui.common; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import org.schabi.newpipe.R; diff --git a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java index f8cecbed93c..26da47b1ff0 100644 --- a/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java +++ b/app/src/main/java/us/shandian/giga/ui/fragment/MissionsFragment.java @@ -7,14 +7,16 @@ import android.content.Intent; import android.content.ServiceConnection; import android.content.SharedPreferences; +import android.net.Uri; import android.os.Bundle; +import android.os.Environment; import android.os.IBinder; import android.preference.PreferenceManager; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; -import android.support.v7.widget.GridLayoutManager; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuItem; @@ -22,9 +24,14 @@ import android.view.ViewGroup; import android.widget.Toast; +import com.nononsenseapps.filepicker.Utils; + import org.schabi.newpipe.R; +import org.schabi.newpipe.settings.NewPipeSettings; +import org.schabi.newpipe.util.FilePickerActivityHelper; import org.schabi.newpipe.util.ThemeHelper; +import java.io.File; import java.io.IOException; import us.shandian.giga.get.DownloadMission; @@ -37,7 +44,7 @@ public class MissionsFragment extends Fragment { private static final int SPAN_SIZE = 2; - private static final int REQUEST_DOWNLOAD_PATH_SAF = 0x1230; + private static final int REQUEST_DOWNLOAD_SAVE_AS = 0x1230; private SharedPreferences mPrefs; private boolean mLinear; @@ -72,7 +79,7 @@ public void onServiceConnected(ComponentName name, IBinder binder) { setAdapterButtons(); - mBinder.addMissionEventListener(mAdapter.getMessenger()); + mBinder.addMissionEventListener(mAdapter); mBinder.enableNotifications(false); updateList(); @@ -138,6 +145,7 @@ public void onAttach(Context context) { * deprecated in API level 23, * but must remain to allow compatibility with api<23 */ + @SuppressWarnings("deprecation") @Override public void onAttach(Activity activity) { super.onAttach(activity); @@ -151,7 +159,7 @@ public void onDestroy() { super.onDestroy(); if (mBinder == null || mAdapter == null) return; - mBinder.removeMissionEventListener(mAdapter.getMessenger()); + mBinder.removeMissionEventListener(mAdapter); mBinder.enableNotifications(true); mContext.unbindService(mConnection); mAdapter.deleterDispose(true); @@ -189,12 +197,10 @@ public boolean onOptionsItemSelected(MenuItem item) { return true; case R.id.start_downloads: item.setVisible(false); - mPause.setVisible(true); mBinder.getDownloadManager().startAllMissions(); return true; case R.id.pause_downloads: item.setVisible(false); - mStart.setVisible(true); mBinder.getDownloadManager().pauseAllMissions(false); mAdapter.ensurePausedMissions();// update items view default: @@ -241,12 +247,28 @@ private void setAdapterButtons() { private void recoverMission(@NonNull DownloadMission mission) { unsafeMissionTarget = mission; - StoredFileHelper.requestSafWithFileCreation( - MissionsFragment.this, - REQUEST_DOWNLOAD_PATH_SAF, - mission.storage.getName(), - mission.storage.getType() - ); + + if (NewPipeSettings.useStorageAccessFramework(mContext)) { + StoredFileHelper.requestSafWithFileCreation( + MissionsFragment.this, + REQUEST_DOWNLOAD_SAVE_AS, + mission.storage.getName(), + mission.storage.getType() + ); + + } else { + File initialSavePath; + if (DownloadManager.TAG_VIDEO.equals(mission.storage.getType())) + initialSavePath = NewPipeSettings.getDir(Environment.DIRECTORY_MOVIES); + else + initialSavePath = NewPipeSettings.getDir(Environment.DIRECTORY_MUSIC); + + initialSavePath = new File(initialSavePath, mission.storage.getName()); + startActivityForResult( + FilePickerActivityHelper.chooseFileToSave(mContext, initialSavePath.getAbsolutePath()), + REQUEST_DOWNLOAD_SAVE_AS + ); + } } @Override @@ -256,7 +278,7 @@ public void onSaveInstanceState(@NonNull Bundle outState) { if (mAdapter != null) { mAdapter.deleterDispose(false); mForceUpdate = true; - mBinder.removeMissionEventListener(mAdapter.getMessenger()); + mBinder.removeMissionEventListener(mAdapter); } } @@ -272,7 +294,8 @@ public void onResume() { mAdapter.forceUpdate(); } - mBinder.addMissionEventListener(mAdapter.getMessenger()); + mBinder.addMissionEventListener(mAdapter); + mAdapter.checkMasterButtonsVisibility(); } if (mBinder != null) mBinder.enableNotifications(false); } @@ -288,15 +311,20 @@ public void onPause() { public void onActivityResult(int requestCode, int resultCode, Intent data) { super.onActivityResult(requestCode, resultCode, data); - if (requestCode != REQUEST_DOWNLOAD_PATH_SAF || resultCode != Activity.RESULT_OK) return; + if (requestCode != REQUEST_DOWNLOAD_SAVE_AS || resultCode != Activity.RESULT_OK) return; if (unsafeMissionTarget == null || data.getData() == null) { - return;// unsafeMissionTarget cannot be null + return; } try { + Uri fileUri = data.getData(); + if (fileUri.getAuthority() != null && FilePickerActivityHelper.isOwnFileUri(mContext, fileUri)) { + fileUri = Uri.fromFile(Utils.getFileForUri(fileUri)); + } + String tag = unsafeMissionTarget.storage.getTag(); - unsafeMissionTarget.storage = new StoredFileHelper(mContext, null, data.getData(), tag); + unsafeMissionTarget.storage = new StoredFileHelper(mContext, null, fileUri, tag); mAdapter.recoverMission(unsafeMissionTarget); } catch (IOException e) { Toast.makeText(mContext, R.string.general_error, Toast.LENGTH_LONG).show(); diff --git a/app/src/main/java/us/shandian/giga/util/Utility.java b/app/src/main/java/us/shandian/giga/util/Utility.java index dc6a67b4b55..21fdd72ad14 100644 --- a/app/src/main/java/us/shandian/giga/util/Utility.java +++ b/app/src/main/java/us/shandian/giga/util/Utility.java @@ -4,11 +4,11 @@ import android.content.ClipboardManager; import android.content.Context; import android.os.Build; -import android.support.annotation.ColorInt; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.content.ContextCompat; +import androidx.annotation.ColorInt; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.core.content.ContextCompat; import android.util.Log; import android.widget.Toast; diff --git a/app/src/main/res/layout-land/activity_player_queue_control.xml b/app/src/main/res/layout-land/activity_player_queue_control.xml index 72f673ffc9d..7467a79cff8 100644 --- a/app/src/main/res/layout-land/activity_player_queue_control.xml +++ b/app/src/main/res/layout-land/activity_player_queue_control.xml @@ -8,14 +8,14 @@ android:fitsSystemWindows="true" tools:context="org.schabi.newpipe.player.BackgroundPlayerActivity"> - - - + - - - - - - + app:layout_behavior="com.google.android.material.appbar.FlingBehavior"> - @@ -130,23 +130,23 @@ android:visibility="gone" tools:text="12:38" tools:visibility="visible" /> - - + + + - + - + - - - + - + - - - - - + - - + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index b70d7325034..92e73234f27 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - + diff --git a/app/src/main/res/layout/activity_main_player.xml b/app/src/main/res/layout/activity_main_player.xml index a55a5df0531..f2b204b7508 100644 --- a/app/src/main/res/layout/activity_main_player.xml +++ b/app/src/main/res/layout/activity_main_player.xml @@ -112,7 +112,7 @@ - - - - - + - - - + + + + - - \ No newline at end of file diff --git a/app/src/main/res/layout/channel_header.xml b/app/src/main/res/layout/channel_header.xml index 0947cb30744..4a0e261c54b 100644 --- a/app/src/main/res/layout/channel_header.xml +++ b/app/src/main/res/layout/channel_header.xml @@ -68,7 +68,7 @@ tools:text="123,141,411 subscribers" tools:visibility="visible"/> - - - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml index e8537cad343..d510bf26d37 100644 --- a/app/src/main/res/layout/fragment_about.xml +++ b/app/src/main/res/layout/fragment_about.xml @@ -1,4 +1,4 @@ - - + diff --git a/app/src/main/res/layout/fragment_bookmarks.xml b/app/src/main/res/layout/fragment_bookmarks.xml index 56e13225ffd..fd2729f121d 100644 --- a/app/src/main/res/layout/fragment_bookmarks.xml +++ b/app/src/main/res/layout/fragment_bookmarks.xml @@ -6,7 +6,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - - - - - - @@ -17,7 +17,7 @@ android:layout_marginTop="90dp" tools:visibility="visible"/> - + - - - @@ -54,4 +54,4 @@ android:layout_height="wrap_content" android:orientation="vertical" /> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml index abbe69ff7bd..85614342dc7 100644 --- a/app/src/main/res/layout/fragment_main.xml +++ b/app/src/main/res/layout/fragment_main.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent"> - - - - - - - - - + app:layout_behavior="com.google.android.material.appbar.FlingBehavior"> - @@ -128,22 +128,21 @@ tools:text="12:38" tools:visibility="visible" /> - + - + - + - + - - - + - + diff --git a/app/src/main/res/layout/list_choose_tabs.xml b/app/src/main/res/layout/list_choose_tabs.xml index e62cf24f14c..ce17e0382be 100644 --- a/app/src/main/res/layout/list_choose_tabs.xml +++ b/app/src/main/res/layout/list_choose_tabs.xml @@ -1,5 +1,5 @@ - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/list_choose_tabs_dialog.xml b/app/src/main/res/layout/list_choose_tabs_dialog.xml index 8c6574e6d18..1798c16a041 100644 --- a/app/src/main/res/layout/list_choose_tabs_dialog.xml +++ b/app/src/main/res/layout/list_choose_tabs_dialog.xml @@ -7,7 +7,7 @@ android:minHeight="?listPreferredItemHeightSmall" android:orientation="horizontal"> - - diff --git a/app/src/main/res/layout/player_popup.xml b/app/src/main/res/layout/player_popup.xml index 7a92c67125a..9fbc22145d1 100644 --- a/app/src/main/res/layout/player_popup.xml +++ b/app/src/main/res/layout/player_popup.xml @@ -181,7 +181,7 @@ tools:ignore="HardcodedText,RtlHardcoded,RtlSymmetry" tools:text="1:06:29"/> - - - - + - - + \ No newline at end of file diff --git a/app/src/main/res/layout/toolbar_layout.xml b/app/src/main/res/layout/toolbar_layout.xml index 096974c039f..5d224bda895 100644 --- a/app/src/main/res/layout/toolbar_layout.xml +++ b/app/src/main/res/layout/toolbar_layout.xml @@ -8,7 +8,7 @@ android:layout_height="wrap_content" android:orientation="vertical"> - - + \ No newline at end of file diff --git a/app/src/main/res/layout/toolbar_search_layout.xml b/app/src/main/res/layout/toolbar_search_layout.xml index 9e9e5144240..fdc7e6d6b01 100644 --- a/app/src/main/res/layout/toolbar_search_layout.xml +++ b/app/src/main/res/layout/toolbar_search_layout.xml @@ -31,8 +31,7 @@ android:layout_height="48dp" android:layout_gravity="right|center_vertical" android:focusable="true" - tools:ignore="RtlHardcoded" - android:background="?attr/selectableItemBackground"> + tools:ignore="RtlHardcoded"> -

+ tools:ignore="AlwaysShowAction" + app:showAsAction="always" /> اختر المتصفح مظلم صيغة الصوت الإفتراضية - الدقة الإفتراضية + الدقة الافتراضية عدم الإعجاب الإعجابات - صور معاينة الفيديو + مدة, تشغيل الفيديو: الصورة المصغرة الشخصية هل تقصد: %1$s\? تنزيل تنزيل - أدخل مسار تنزيل الملفات الصوتية - يتم تخزين الصوت الذي تم تنزيله هنا + اختر مجلد التنزيل لملفات الصوت + يتم تخزين الملفات الصوتية التي تم تنزيلها هنا مسار مجلد الصوتيات المحفوظة - أدخل مسار التنزيل لملفات الفيديو - مسار حفظ تنزيلات الفيديو في - مسار ملفات الفيديو المحفوظة + اختر مجلد التنزيل لملفات الفيديو + يتم تخزين ملفات الفيديو التي تم تنزيلها هنا + مجلد تحميل الفيديو "لا يمكن إنشاء مجلد للتنزيلات في '%1$s'" - "تم إنشاء مجلد تنزيلات في '%1$s'" + إنشاء دليل التنزيل \'%1$s\' تثبيت تطبيق Kore غير موجود. هل تريد تثبيته ؟ مضيء @@ -42,7 +42,7 @@ مشاركة مشاركة بواسطة عرض مقاطع الفيديو \"التالية\" و \"المشابهة\" - عرض خيار لتشغيل الفيديو بواسطة مشغل كودي + عرض خيار تشغيل الفيديو عبر وسائط Kodi عرض خيار التشغيل بواسطة كودي السمة تم النشر يوم %1$s @@ -66,12 +66,12 @@ في الخلفية تشغيل تلقائي اسود - التاريخ وذاكرة التخزين المؤقت + مراقبة السجل التاريخ و ذاكرة التخزين المؤقت - المحتوى - التنزيلات - التنزيلات - الكل + محتوى + التحميلات + التحميلات + الجميع القناة الفيديو التنزيل @@ -79,8 +79,8 @@ عن التطبيق التاريخ التاريخ - افتح في وضع النافذة المنبثقة - يزيل الصوت في بعض الخيارات + فتح في وضع منبثق + يزيل الصوت في بعض مستوى الدقة وضع النوافذ المنبثقة NewPipe تم إلغاء الاشتراك في القناة تعذر تغيير حالة الاشتراك @@ -88,7 +88,7 @@ نافذة المنبثقة تشغيل مقطع الفيديو عند إستدعاء NewPipe من تطبيق آخر الدقة الافتراضية لنوافذ المنبثقة - "عرض أعلى جودة " + عرض أعلى جودة بعض الأجهزة فقط تدعم تشغيل مقاطع الفيديو 2K / 4K تنسيق الفيديو الافتراضي تذكر حجم النافذة و وضعها @@ -107,17 +107,17 @@ المشغل السلوك الوضع المنبثق - يتم التشغيل في الوضع المنبثق + تشغيل في وضع منبثق تم وضعه على قائمة الانتظار في مشغل الخلفية تم وضعه على قائمة الانتظار في مشغل النافذة المنبثقة محتوى مقيد بحسب العمر "إظهار الفيديو المقيد بحسب العمر. يمكن السماح باستخدام هذه المواد من \"الإعدادات\"." بث مباشر - تقرير الخطأ + تقرير خطأ قائمة التشغيل نعم لاحقاً - مُعطل + تعطيل فلتر تحديث تنظيف @@ -153,16 +153,16 @@ الصوت إعادة المحاولة تم رفض إذن الوصول إلى التخزين - ألف + K مليون - بليون + G ليس هناك مشترِكون - %s لا يوجد مشترك + %s لا يوجد مشاركين %s مشترك - %s اثنتين مشتركين + "%s مشتركتين" %s اشتراكات - %s مشتركين + %s مشاركين %s مشتركون دون مشاهدات @@ -184,7 +184,7 @@ انقر للحصول على التفاصيل يُرجى الإنتظار… تم نسخه إلى الحافظة - الرجاء تحديد مجلد لحفظ التنزيلات + يرجى تحديد مجلد التنزيل لاحقا في الإعدادات هذا الإذن مطلوب \nللفتح في وضع النافذة المنبثقة اختبار reCAPTCHA @@ -200,7 +200,7 @@ فتح الموقع المساهمون التراخيص - تطبيق حُر و خفيف لتشغيل اليوتيوب على نظام الأندرويد. + تطبيق مجاني خفيف الوزن وبث حي على نظام أندرويد. ساهم إذا كانت لديك أفكار؛ أو ترجمة، أو تغييرات تخص التصميم، أو تنظيف و تحسين الشفرة البرمجية ، أو تعديلات عميقة عليها، فتذكر أنّ مساعدتك دائما موضع ترحيب. وكلما أتممنا شيئا كلما كان ذلك أفضل ! عرض على GitHub @@ -234,9 +234,9 @@ التفاصيل الإعدادات الصوتية تشغيل هنا - تشغيل هنا في وضع النافذة المنبثقة + تشغيل في وضع نافذة منبثقة تحدي الكابتشا - اضغط للإدراج في قائمة الانتظار + ضغط مطول للإدراج الى قائمة الانتظار بدون مشاهدات %s مشاهدة @@ -246,12 +246,12 @@ %s مشاهدين - %s فيديو + %s لا يوجد فيديو %s فيديو - %s فيديوهان - %s فيديو + %s فيديوان + %s فيديوات %s فيديوهات - %s فيديو + %s مزيد من الفيديوات طلب اختبار الكابتشا مطلوب © %1$sبواسطة%2$sتحت%3$s @@ -260,7 +260,7 @@ الكشك إدراج في قائمة الانتظار في الخلفية إدراج في قائمة الانتظار على المنبثقة - تشغيل في الخلفية + ابدأ التشغيل في الخلفية المحتوى الإفتراضي حسب البلد تغيير الإتجاه الإنتقال إلى التشغيل في الخلفية @@ -272,7 +272,7 @@ دائماً مرة واحدة فقط العنوان خاطئ - لم يتم العثور على مشغل الفيديو (يمكنك تثبيت VLC وتشغيله). + لم يتم العثور على مشغل الفديو (يمكنك تثبيت VLC لتشغيله). استيراد قاعدة البيانات تصدير قاعدة البيانات "الكتابة فوق سجل التاريخ والاشتراكات الحالية " @@ -307,11 +307,6 @@ لا يمكن حذف قائمة التشغيل. ملئ الشاشة تكبير - حجم خط التسمية - أصغر خط - خط عادي - خط ذو حجم كبير - مُزامَنة تنزيل ملف البث الإشارات المرجعية استعمال التقديم السريع الغير دقيق @@ -340,7 +335,7 @@ إزالة جميع بيانات صفحات الويب المخزنة مؤقتًا تم محو ذاكرة التخزين المؤقت للبيانات الوصفية وضع البث القادم تلقائيا في قائمة الإنتظار - رفض التدفق-التلقائي المشابه في حال كان التدفق السابق يعمل في-حالة عدم التكرار. + إلحاق التدفق المرتبط تلقائيا عند تشغيل التدفق الأخير في قائمة انتظار مِن دون تكرار إضافة صورة مصغرة إلى قائمة التشغيل تفضيل قائمة التشغيل تم تغيير الصورة المصغرة لقائمة التشغيل. @@ -352,9 +347,9 @@ تقرير الأخطاء خارج دورة الحياة فرض الإبلاغ عن استثناءات Rx غير القابلة للتسليم خارج دورة حياة الجزء أو النشاط بعد التخلص منها محو سجل المشاهدة - احذف سِجل الفيديوهات التي تم تشغيلها + حذف محفوظات التدفقات التي تم تشغيلها ومواقف التشغيل حذف سجل المشاهدة بالكامل\? - تم حذف سجل المشاهدة. + تم حذف سجل المشاهدة. محو سجل البحث يحذف تاريخ البحث عن الكلمات الرئيسية حذف سِجل البحث بالكامل\? @@ -430,11 +425,11 @@ تتبيه تحديث التطبيق إيماءة التحكم بالصوت الأحداث - التنبيه بإصدارات newpipe الجديدة - ذاكرة التخزين الخارجي غير متوفرة - التحميل إلى بطاقة الذاكرة الخارجية ليس متاحا حتى الآن. إعادة تعيين موقع مجلد التحميل؟ - باستخدام علامات الجدولة الافتراضية، حدث خطأ أثناء قراءة علامات التبويب المحفوظة - استعادة الافتراضيات + إخطارات NewPipe جديدة  الإصدار + ذاكرة التخزين الخارجية غير متوفرة + "التنزيل على بطاقة SD الخارجية غير ممكن. إعادة تعيين موقع مجلد التحميل؟" + استخدام خطأ علامات التبويب الافتراضية, أثناء قراءة علامات التبويب المحفوظة + استعادة الضبط الافتراضي هل تريد استعادة الإعدادات الافتراضية؟ عدد المشتركين غير متاح ما هي التبويبات التي تظهر على الصفحة الرئيسية @@ -481,6 +476,50 @@ توقف أقصى عدد للمحاولات الحد الأقصى لعدد محاولات قبل إلغاء التحميل - "ايقاف عند التحويل إلى البيانات المتنقلة" - سيتم إعادة تحميل التنزيلات التي لا يمكن إيقافها + "إنقطع الإتصال بالشبكة عند التحويل إلى البيانات المتنقلة" + مفيد عند التبديل إلى بيانات الجوال ، على الرغم من أنه لا يمكن تعليق بعض التنزيلات + إظهار التعليقات + تعطيل لإيقاف عرض التعليقات + تشغيل تلقائي + + التعليقات + + + + + + + لا توجد تعليقات + تعذر تحميل التعليقات + إغلاق + استئناف التشغيل + استعادة آخر موقف التشغيل + واضع القوائم + إظهار مؤشرات وضع التشغيل في القوائم + امسح البيانات + تم حذف وضع التشغيل. + نقل الملف أو حذفه + يوجد ملف بهذا الاسم مسبقاً + لا يمكن الكتابة فوق الملف + هناك تنزيل معلق بهذا الاسم + تم إغلاق NewPipe أثناء العمل على الملف + لم يتبقى مساحة في الجهاز + تم فقد التقدم بسبب حذف الملف + انتهى وقت الاتصال + هل أنت واثق؟ + حد قائمة انتظار التنزيل + سيتم تشغيل تنزيل واحد في نفس الوقت + بدء التنزيلات + إيقاف التحميل مؤقتا + اسأل عن مكان التنزيل + سيُطلب منك مكان حفظ كل تنزيل + سيُطلب منك مكان حفظ كل تنزيل. اختر SAF إذا كنت تريد التنزيل على بطاقة SD خارجية + استخدام آمن + إطار وصول التخزين يسمح لتنزيلات على بطاقة SD الخارجية. +\nملاحظة: بعض الأجهزة غير متوافقة + حذف مواقف التشغيل + حذف كل مواقف التشغيل + حذف كل مواقف التشغيل؟ + تغيير مجلدات التنزيل إلى حيز التنفيذ‮‮‮ + تبديل الخدمة ، المحدد حاليًا: \ No newline at end of file diff --git a/app/src/main/res/values-b+ast/strings.xml b/app/src/main/res/values-b+ast/strings.xml index b256888cb21..d38f5f9e085 100644 --- a/app/src/main/res/values-b+ast/strings.xml +++ b/app/src/main/res/values-b+ast/strings.xml @@ -1,380 +1,361 @@ - + - Calca na gueta pa entamar - %1$s visiones + + %1$s visualizaciones Espublizóse\'l %1$s - Nun s\'alcontró un reproductor de fluxos. ¿Quies instalar VLC? - Instalar + + Encaboxar - Abrir nel restolador + Abrir nun restolador web Compartir - Baxar - Guetar + + Axustes - ¿Quixesti dicir %1$s? - Compartir con - Escoyer restolador - voltéu - Usar reproductor esternu de videu - Usar reproductor esternu d\'audiu - - Camín de descarga de vídeos - Camín nel qu\'atroxar los vídeos baxaos - Introducir camín de descarga pa vídeos - - Camín de descarga p\'audios - Camín nel qu\'atroxar los audios baxaos. - Introducir camín de descarga pa ficheros d\'audiu - - Resolución por defeutu - Reproducir con Kodi - Nun s\'alcontró Kore. ¿Instalalu? - Amosar opción «Reproducir con Kodi» - Amuesa una opción pa reproducir un videu per Kodi + ¿Quixesti dicir %1$s\? + + + + Usar un reproductor esternu de videu + Usar un reproductor esternu d\'audiu + + + + + + + Resolución predeterminada + Reproducir en Kodi + + Amosar la opción «Reproducir en Kodi» + Amuesa una opción pa reproducir un videu pel centru multimedia Kodi Audiu - Formatu por defeutu d\'audiu - Tema - Escuru - Claru - - Baxar - Videu siguiente - Amosar vídeos siguientes y asemeyaos - URL non sofitada - Llingua por defeutu del conteníu + Formatu predetermináu d\'audiu + Estilu + Escuridá + Claridá + + Darréu + + + Llingua predeterminada del conteníu Videu y audiu Aspeutu - Otru - Reproduciendo de fondu - Reproducir - Conteníu - Amosar conteníu torgáu pola edá - El videu ta torgáu pola edá. Desactiva esto diendo primero a axustes. - en direuto - Descargues - Descargues - Informe de fallu - + + + + + Conteníu torgáu pola edá + + EN DIREUTO + + + Fallu - Fallu de rede + Nun pudieron cargase toles miniatures - Nun pudo descifrase la robla de la URL + Nun pudo descifrase la robla de la URL del videu Nun pudo analizase\'l sitiu web - Nun pudo analizase dafechu\'l sitiu web - Conteníu non disponible - Nun pudo configurase\'l menú de descarga - Esto ye una tresmisión de direuto qu\'entá nun se sofita. - Nun pudo consiguise tresmisión dala - Perdón, eso nun debió asoceder. - Informar per corréu del fallu - Perdón, asocedieron dellos fallos. - INFORMAR + + + + Entá nun se sofiten los fluxos en direuto + Nun pudo consiguise dengún fluxu + Perdona pero eso nun debió asoceder. + + Perdona pero asocedió dalgún fallu. + Información: - Qué asocedió: - El to comentariu (n\'inglés): + + Detalles: - - - Miniatura de previsualización del videu - Miniatura de previsualización del videu + + Préstames - Usar Tor - (Esperimental) Forcia\'l tráficu de descargues pente Tor pa más privacidá (la tresmisión de vídeos entá nun se sofita). - Informa d\'un fallu - Informe d\'usuariu - - Nun pue crease\'l direutoriu de descarga «%1$s» - Creose\'l direutoriu de descarga «%1$s» - + Usar TOR + + + + + Creóse\'l direutoriu de descarga «%1$s» Videu Audiu - Retentar - Ñegóse\'l permisu d\'accesu al almacenamientu - - Aniciar - Posar - Reproducir + + + + + Desaniciar Suma de comprobación - Misión nueva - Val - Nome de ficheru + + Filos Fallu - Sirvidor ensin sofitu - Yá esiste\'l ficheru - URL malformada o internet non disponible - Calca pa detallles - Espera, por favor… + + + + + Espera… Copióse al cartafueyu - Esbilla una carpeta disponible de descarga, por favor - - Auto-reproduz un videu al llamar a NewPipe dende otra aplicación - Auto-reproducción - Miniatura del avatar del xubidor - Despréstames - - - NewPipe baxando - Nun pudo cargase la imaxe - Cascó l\'aplicación/IU - Lo qu\'asocedió:\\nSolicitú:\\nLlingua del conteníu:\\nServiciu:\\nHora GMT:\\nPaquete:\\nVersión:\\nVersión del SO: - Abrir en ventanu emerxente - Mou de ventanu emerxente de NewPipe - - Formatu por defeutu de videu + + + + + Tarrezmes + + + + + + + Formatu predetermináu de videu Prietu - - Reproduciendo en ventanu emerxente - Too + + Canal Sí - Más sero - Desactivóse - - - M - Mill - MMill - Precísase esti permisu p\'abrir -\nen ventanu emerxente - + + + Mil + Mill. + Mil mill. + Precísase esti permisu +\np\'abrir nel mou ventanu reCAPTCHA - Prueba reCAPTCHA - Solicitóse la prueba reCAPTCHA - - Fondu - Ventanu emerxente - - Resolución por defeutu del ventanu emerxente + Retu de reCAPTCHA + Solicitóse\'l retu de reCAPTCHA + + Ventanu + Resolución predeterminada del ventanu Amosar resoluciones más altes - Namái dellos preseos sofiten vídeos en 2K/4K - Peñera - Refrescar + Namái dalgunos preseos sofiten la reproducción de vídeos en 2K/4K + + Llimpiar - - Delles resoluciones NUN tendrán audiu al activar esta opción - Recuerdar tamañu y posición del ventanu emerxente - Recuerda la cabera posición y resolución afitaes nel ventanu emerxente - Controles per xestos del reproductor + Quita l\'audiu en DALGUNES resoluciones + + + Usa xestos pa controlar el brilléu y volume del reproductor - Suxerencies de gueta - Amuesa suxerencies al guetar - - Ventanu emerxente - Redimensionáu - - Soscribise - Soscribiéstite - Desoscribiéstite de la canal - Nun pue camudase la resolución - Nun pue anovase la soscripción - - Principal + + + + + + + + + Nun pudo anovase la soscripción + Soscripciones - Qué hai nuevo - - Historial de gueta - Atroxa de mou llocal les solicitúes de gueta - Historial - Fai un siguimientu de los vídeos vistos - Siguir al ganar el focu - Sigue reproduciendo tres les interrupciones (por exemplu, llamaes de teléfonu) + + + + + Siguir al recuperar el focu + Sigue cola reproducción dempués de les interrupciones (llamaes telefóniques, por exemplu) Reproductor Comportamientu - Historial - Llistáu de reproducción + Historial y caché + La meyor resolución - Desfacer - + Avisu de NewPipe - Avisos pa los reproductores de fondu y en ventanu emerxente de NewPipe - - Ensin resultaos + + Nun hai resultaos Equí nun hai más que grillos - - Ensin soscriptores + - %s soscriptor - %s soscriptores - - - Ensin visionaos + %s soscriptor + %s soscriptores + + Nun hai visualizaciones - %s visionáu - %s visionaos - - - Nun hai vídeos - - %s videu - %s vídeos - - - Descargues - Caráuteres permitíos nos nomes de ficheros - Los caráuteres non válidos tróquense por esti valor - Troquéu de caráuteres - + %s visualización + %s visualizaciones + + + Descarga + + + Lletres y díxitos La mayoría de caráuteres especiales - Tocante a NewPipe Axustes Tocante a Llicencies de terceros - © %1$s por %2$s so la %3$s + © %1$s por %2$s so %3$s Nun pudo cargase la llicencia - Abrir sitiu web + Tocante a Collaboradores Llicencies - Un frontal llixeru de YouTube p\'Android. + Ver en GitHub Llicencia de NewPipe - Si tienes idees, quies traducir, facer cambeos, llimpiar el códigu u otres coses, l\'ayuda siempres s\'agradez. ¡Cuánto más se faiga, más s\'ameyora! - Lleer llicencia - Collaborar - + + Lleer la llicencia + Collaboración Historial - Guetao - Visto - L\'historial ta desactiváu + + Vióse + Historial L\'historial ta baleru - Llimpióse l\'historial - Desanicióse l\'elementu - ¿Quies desaniciar esti elementu del historial de gueta? -Reproducir too - - Nun pudo reproducise esta tresmisión - Asocedió un error irrecuperable del reproductor - Recuperándose del error del reproductor - + + + + + Nun pudo reproducise esti fluxu + Asocedió un fallu irrecuperable del reproductor + Conteníu de la páxina principal - Páxina en blancu - Páxina del quioscu - Páxina de suscripción - Páxina de fluxu - Páxina de canal - Seleiciona un canal - Entá nun hai canales soscritos - Seleiciona un quioscu - + Páxina balera + + + + + + + Quioscu Tendencies - 50 meyores - Reproductor de fondu - Desaniciar + + + Detalles - Nuevo y popular - Axustes d\'audiu - Amosar conseyu Mantener p\'amestar - Amuesa\'l conseyu al primir el botón de Ventanu o tener el videu de fondu na so páxina de detalles - Púnxose na cola del reproductor de fondu - Púnxose na cola nel reproductor de ventanu - [Desconozse] - - Reproductor en ventanu - Mantener p\'amestar - Púnxose na cola de fondu - Púnxose na cola del ventanu - Entamar reproducción equí - Entamar equí de fondu - Entamár equí de ventanu -Donar - NewPipe ta desendolcáu por voluntarios que gasten el so tiempu llibre pa ufrite la meyor esperiencia. ¡Agora ye momentu de devolve-yos el favor p\'aseguar l\'ameyoramientu de NewPipe mentanto esfruten d\'un café! - Devolver favor + + + + + + + + + + + + + Reproducir en segundu planu + Reproducir nun ventanu + Donación + + Donar Sitiu web - Pa consiguir información y les anuncies caberes tocante a NewPipe visita\'l nuesu sitiu web. - Nun s\'alcontró un reproductor de fluxos (pues instalar VLC pa reproducilu) - País predetermináu de conteníu - Serviciu + Visita\'l sitiu web de NewPipe pa más información y noticies. + + País predetermináu del conteníu + Siempres - Namái un vegada - - Alternar orientación - Camudar a segundu planu - Camudar a ventanu - Camudar a principal - - Importar base de datos - Esportar base de datos - Va sobrescribise l\'historial y soscripciones actuales - Esporta l\'hisotorial, soscripciones y llistaos de reproducción. - Los reproductories esternos nun sofites estes tribes d\'enllaces - URL non válida - Nun s\'alcontraron fluxos de videu - Nun s\'alcontraron fluxos de videu - - Esportación completada - Importación completada - Ficheru ZIP non válidu - ALVERTENCIA: Nun pudieron importase tolos ficheros. - Esto va sobrescribir la configuración actual. - - Abrir caxón - Zarrar caxón - - Reproductor de videu - Reproductor en segundu planu - Reproductor en ventanu - - Consiguiendo información… - Ta cargando\'l conteníu solicitáu -Baxa\'l ficheru del fluxu. - Amosar información - - Marcadores - - Amestar a - - Depuración - Arrastra pa reordenar - - Crear - Desaniciar unu - Desaniciar too + + + + + + + + Anula l\'historial y les soscripciones actuales + + + URL nun ye válida + + + + + + + Esto va anular la configuración actual. + + + + + + + + + Amosar la información + Llistes de reproducción en marcadores + + + + + + Escartar - Renomar - - ¿Quies desaniciar esti elementu del historial de visualizaciones? - ¿De xuru que quies desaniciar tolos elementos del historial de visualizaciones? - Lo más reproducío - - Equí va haber daqué ceo ;D - - - Entrugar siempres - - Crear llistáu de reproducción - Desaniciar llistáu de reproducción - Renomar llistáu de reproducción + + + + + Equí va apaecer dalgo ceo ;D + + + + Nome - Amestar al llistáu de reproducción - Afitar como miniatura del llistáu de reproducción - - Amestar llistáu de reproducción a Marcadores - Desaniciar marcador - - ¿Quies desaniciar esti llistáu de reproducción? - Fallu al desaniciar el llistáu de reproducción - + + + + + ¿Desaniciar esta llista de reproducción\? + Nun pudo desaniciase la llista de reproducción. Ensin sotítulos - - AXUSTAR - RELLENAR - ZOOM - - Tamañu de fonte de sotítulos - Fonte más pequeña - Fonte media - Fonte más grande - - Activar LeakCanary - La supervisión d\'escapes de memoria podría facer que l\'aplicación nun respuenda al volquiar la pila - - Informar de fallos fuera de ciclos - + Axustar + Rellenar + Zoom + + + + Ficheru + El ficheru nun esiste o falta\'l permisu d\'escritura o llectura + Asocedió un fallu: %1$s + Importación/Esportación + Importando… + Esportando… + Nun pudieron esportase les soscripciones + Aición preferida d\'apertura + ¿Quies importar los axustes tamién\? + Lleer la política de privacidá + Canales + Llistes de reproducción + Pistes + Usuarios + Llingüeta nueva + Usa xestos pa controlar el volume del reproductor + Usa xestos pa controlar el brilléu del reproductor + Valores predeterminaos + El númberu de soscriptores nun ta disponible + Esbilla + Anovamientos + Amuesa un avisu qu\'apaez cuando hai disponible una versión nueva + Llista + Rexáu + Finó + Falló la descarga + Hai una descarga en cursu con esti nome + Nun pue crease la carpeta de destín + Falló la conexón segura + Nun pue coneutase col sirvidor + Llimpiar les descargues finaes + Reintentos máximos + Eventos + Conferencies + Reproducción automática + Nun pudieron cargase los comentarios + El ficheru movióse o desanicióse + Yá esiste un ficheru con esti nome + Yá esiste un ficheru baxáu con esti nome + nun pue sobrescribise\'l ficheru + Hai una descarga pendiente con esti nome + Escosó l\'espaciu del preséu + Escosó\'l tiempu d\'espera de la conexón + Nun pudieron importase les soscripciones + Sotítulos + Aceutar + ¿Quies reafitar los valores\? + + El sirvidor nun aceuta descargues multifilu, volvi probar con @string/msg_threads = 1 + Nun hai comentarios + Llimpieza de datos + \ No newline at end of file diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml index faa4debff3e..93307cbcfc7 100644 --- a/app/src/main/res/values-be/strings.xml +++ b/app/src/main/res/values-be/strings.xml @@ -63,7 +63,7 @@ Хуткі пошук пазіцыі Недакладны пошук дазваляе плэеру шукаць пазіцыю хутчэй, але менш дакладна Загружаць мініяцюры - Адключыце, каб не загружаць мініяцюры і зэканоміць трафік і памяць. Змена налады ачысьціць кэш малюнкаў у памяці і носьбіце + Адключыце, каб не загружаць мініяцюры і зэканоміць трафік і памяць. Змена налады ачысьціць кэш малюнкаў Кэш малюнкаў ачышчаны Ачысціць кэш метададзеных Выдаліць усе загружаныя дадзеныя вэб-старонак @@ -76,13 +76,13 @@ Адлюстроўваць падказкі пры пошуку Гісторыя пошуку Захоўваць пошукавыя запыты лакальна - Гісторыя і кэш + Гісторыя праглядаў Запамінаць прагледжаныя відэа Аднавіць пры фокусе Аднаўляць прайграванне пасля перапынкаў (напрыклад, тэлефонных званкоў) Спампаваць - Наступнае відэа - \"Наступнае\" и \"Прапанаваныя\" + Наступнае + \"Наступнае\" и \"Прапанаванае\" відэа \"Зацісніце, каб дадаць\" Паказаць падказку пры націсканні \"У акне\" ці \"У фоне\" на старонцы звестак аб відэа URL не падтрымліваецца @@ -104,8 +104,8 @@ Прайграць Кантэнт Кантэнт 18+ - Відэа з узроставымі абмежаваннямі. Дазволіць падобны кантэнт можна ў наладах. - ужывую + Відэа з узроставымі абмежаваннямі. Дазволіць падобны кантэнт можна ў \"Наладах\". + Трансляцыя Загрузкі Загрузкі Справаздача пра памылку @@ -138,15 +138,15 @@ Перайсці ў галоўнае акно Імпарт дадзеных Экспарт дадзеных - Ваша бягучая гісторыя і падпіскі перазапішуцца + Бягучыя падпіскі, плэйлісты і гісторыя будуць заменены Экспарт гісторыі, падпісак і плэйлістоў Ачысціць гісторыю праглядаў Выдаліць гісторыю прайграных патокаў - Выдаліць усю гісторыю праглядаў. - Гісторыя праглядаў выдалена. + Выдаліць усю гісторыю праглядаў\? + Гісторыя праглядаў выдалена. Ачысціць гісторыю пошуку Выдаліць гісторыю пошукавых запытаў - Выдаліць усю гісторыю пошуку. + Выдаліць усю гісторыю пошуку\? Гісторыя пошуку выдалена. Памылка Памылка сеткі @@ -156,7 +156,7 @@ Не атрымалася цалкам разабраць вэб-сайт Кантэнт недаступны Не атрымалася стварыць меню загрузкі - Гэта прамая трансляцыя, яны пакуль не падтрымліваюцца. + Прамыя трансляцыі пакуль не падтрымліваюцца Не атрымалася знайсці ні аднаго патока Не атрымалася загрузіць малюнак Падзенне прыкладання/UI @@ -167,8 +167,8 @@ Няправільная спасылка Патокі відэа не знойдзены Патокі аўдыё не знойдзены - Няправільная папка - Няправільны файл або крыніца кантэнту + Няма такой тэчкі + Тэчка або крыніца кантэнту не існуюць Файл не існуе або няма дазволу на яго чытанне або запіс Імя файла не можа быць пустым Адбылася памылка: %1$s @@ -217,7 +217,7 @@ Няма відэа - %s відэа + %s Відэа %s відэа %s відэа @@ -243,7 +243,7 @@ Падрабязнасці Пачакайце… Скапіявана ў буфер абмену - Выберыце даступную папку для загрузкі + Абярыце тэчку для загрузкі пазней у наладах Гэтае разрозненне трэба для \nпрайгравання ў акне 1 элемент выдалены. @@ -286,7 +286,7 @@ Гісторыя Гісторыя пошуку Прагледжана - Гісторыя адключаная + Гісторыя адключана Гісторыя Гісторыя пустая Гісторыя ачышчана @@ -321,11 +321,11 @@ Падрабязнасці Налады аўдыё Зацісніце, каб дадаць у чаргу - У чаргу \"У фоне\" - У чаргу \"У акне\" - Відэаплэер - Фонавы плэер - Плэер у акне + Дадаць ў чаргу \"У фоне\" + Дадаць ў чаргу \"У акне\" + Пачаць адсюль у плэеры + Пачаць адсюль у фоне + Пачаць адсюль у акне Адкрыць бакавую панэль Зачыніць бакавую панэль Хутка тут сёе-тое з\'явіцца ;D @@ -338,14 +338,14 @@ Атрыманне звестак… Загрузка запытанага кантэнту Стварыць плэйліст - Выдаліць плэйліст - Перайменаваць плэйліст + Выдаліць + Перайменаваць Імя Дадаць у плэйліст На мініяцюру плэйліста Дадаць плэйліст у закладкі Выдаліць закладку - Выдаліць гэты плэйліст? + Выдаліць плэйліст\? Плэйліст створаны Дададзена ў плэйліст Мініяцюра плэйліста зменена @@ -356,12 +356,12 @@ Наблізіць Створаны аўтаматычна Тытры - Змяніць памер і фон тытраў. Змены ўступяць у сілу пасля перазапуску + Змяніць памер тэкста і фон тытраў. Патрэбен перазапуск Уключыць LeakCanary Маніторынг уцечкі памяці можа прывесці да завісання прыкладання Паведамляць пра памылкі жыццёвага цыклу Прымусова паведамляць пра недастаўляемыя Rx-выключэнні па-за фрагментам або жыццёвым цыкле пасля выдалення - Імпарт/Экспарт + Імпарт і Экспарт Імпарт Імпарт з Экспарт у @@ -400,9 +400,109 @@ Без абмежаванняў Ліміт разрознення ў мабільнай сетцы Пры згортванні плэера - Пры пераключэнні са стандартнага плэера на іншае прыкладанне — %s + Дзеянне пры пераключэнні са стандартнага плэера на іншае прыкладанне — %s Нічога не рабіць Фонавы плэер Плэер у акне Адпісацца + Новая ўкладка + Абярыце ўкладку + Жэст гучнасці + Мяняць гучнасць плэера жэстам + Жэст яркасці + Мяняць яркасць плэера жэстам + Абнаўлення + Файл выдалены + Апавяшчэнне аб абнаўленні + Апавяшчэння аб новай версіі NewPipe + Знешняе сховішча недаступна + Загрузка на знешнюю SD-карту немагчымая. Скінуць размяшчэнне тэчкі загрузкі\? + Памылка чытання захаваных укладак. Выкарыстоўваюцца ўкладкі па змаўчанні + Аднавіць значэнні па змаўчанні + Аднавіць значэнні па змаўчанні\? + Колькасць падпісчыкаў недаступная + Ўкладкі, бачныя на галоўнай старонцы + Выбар + Абнаўлення + Паказаць апавяшчэнне пры наяўнасці новай версіі + Выгляд спісу + Спіс + Сетка + Аўтаматычна + Пераключыць выгляд + Даступна абнаўленне NewPipe! + Націсніце для загрузкі + Скончана + У чарзе + прыпынена + у чарзе + постапрацоўка + Чарга + Дзеянне забаронена сістэмай + Памылка загрузкі + Загрузка завершана + %s загрузак завершана + Стварыць унікальнае імя + Перазапісаць + Загрузка з такім імем ужо выконваецца + Паказаць тэкст памылкі + Код + Тэчка прызначэння не можа быць створана + Файл не можа быць створаны + Доступ забаронены сістэмай + Немагчыма ўсталяваць абароненае злучэнне + Сервер не знойдзены + Немагчыма злучыцца з серверам + Не атрымалася атрымаць дадзеныя з сервера + Сервер не падтрымлівае шматструменную загрузку, паспрабуйце з @string/msg_threads = 1 + Запытаны дыяпазон недапушчальны + Не знойдзена + Пасляапрацоўка не ўдалася + Ачысціць завершаныя + Аднавіць прыпыненыя загрузкі (%s) + Спыніць + Максімум спробаў + Колькасць спробаў перад адменай загрузкі + Перапыніць у платных сетках + Карысна пры пераключэнні на мабільную сетку, хоць некаторыя загрузкі не могуць быць прыпыненыя + Падзеі + Канферэнцыі + Паказаць каментарыі + Адключыце, каб схаваць каментарыі + Аўтазапуск + + Каментарый + + + + Каментарыі адсутнічаюць + Каментарыі не атрымалася загрузіць + Зачыніць + Працягваць прайграванне + Аднаўляць з апошняй пазіцыі + Пазіцыі ў спісах + Адлюстроўваць індыкатары пазіцый прагляду ў спісах + Ачысціць дадзеныя + Пазіцыі прайгравання выдалены + Файл перамешчаны ці выдалены + Файл з такім імем ужо існуе + Файл з такім імем ужо існуе + немагчыма перазапісаць файл + У чарзе ўжо ёсць загрузка з такім імем + NewPipe была зачынена падчас працы над файлам + Скончылася вольнае месца на прыладзе + Прагрэс страчаны, так як файл быў выдалены + Час злучэння выйшла + Вы ўпэўненыя\? + Абмежаваць чаргу загрузкі + Толькі адна адначасовая загрузка + Пачаць загрузку + Прыпыніць загрузку + Запытваць тэчку загрузкі + Для кожнай загрузкі запытваць тэчку для захавання + Для кожнай загрузкі запытваць тэчку для захавання. +\nВыкарыстоўвайце SAF для загрузкі на знешні назапашвальнік + Выкарыстоўваць SAF + Storage Framework Access дазваляе захоўваць файлы на вонкавым назапашвальніку. +\nПадтрымліваецца не ўсімі прыладамі \ No newline at end of file diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml index 9cf5a4702c9..be52c0900bd 100644 --- a/app/src/main/res/values-bg/strings.xml +++ b/app/src/main/res/values-bg/strings.xml @@ -1,5 +1,6 @@ - -Докоснете търсачката, за да започнете + + + Докоснете търсачката, за да започнете %1$s гледания Публикувано на %1$s Не е намерен стрийм плейър. Желаете ли да инсталирате VLC? @@ -24,22 +25,16 @@ Премахнат абонамент за канала Неуспешна промяна на абонамента Неуспешно обновление на абонамента - Абонаменти - Обновления - Във фонов режим В прозорец - Директория за изтегляне на видео Папка за съхранение на изтеглените видеота Въведете път за съхранение на изтеглените видеота - Директория за изтегляне на аудио Папка за съхранение на изтеглено аудио Въведете път за съхранение на изтеглено аудио - Автоматично възпроизвеждане Въпроизвежда видео, когато NewPipe е повикан от друго приложение Резолюция по подразбиране @@ -89,7 +84,7 @@ Възпроизвеждане Съдържание Съдържание за възрастни - Покажи съдържание за възрастни. Разрешаването на такова съдържание става от \"Настройки\". + Покажи съдържание за възрастни. Разрешаването на такова съдържание става от Настройки. НА ЖИВО Изтегляния Изтегляния @@ -107,12 +102,9 @@ Най-добра резолюция Отмени Възпроизведи всички - Известия от NewPipe Известия за Фонов плейър и плейъра в Отделен прозорец на NewPipe - [Неизвестен] - Грешка Проблем с мрежата Не мога да заредя всички миниатюри @@ -127,7 +119,6 @@ Неуспех при възпроизвеждането на този поток Критичен проблем с плейъра Опит за възстановяване от възникналия проблем с плейъра - Съжаляваме, това не би трябвало да се случва. Докладвай за грешката чрез имейл Съжаляваме, възникнаха някои грешки. @@ -136,8 +127,6 @@ Какво се случи: Вашият коментар (на английски): Подробности: - - Миниатюра на видео Миниатюра на аватара на качилия видео Харесвания @@ -147,39 +136,31 @@ Докладвай за грешка Няма резултати Тук няма нищо - Неуспешно създаване на директория за изтеглени в „%1$s“ Бе създадена директория за свалянията в „%1$s“ - Видео Аудио Опитай отново Достъпа до хранилището е отказан - - %s абонат - %s абонати - - + %s абонат + %s абонати + Няма гледания - %s гледане - %s гледания - - + %s гледане + %s гледания + Няма клипове - %s клип - %s клипове - - + %s Клип + %s Клипове + Пауза Начало Изтрий Контролна сума - ОК - Име на файла Нишки Грешка @@ -193,7 +174,6 @@ Позволени символи в името на файловете Невалидните символи се заменят с тази стойност Символ за замяна - Букви и цифри За NewPipe Настройки @@ -208,12 +188,9 @@ Виж в GitHub Изтегли стрийм файл Покажи инфо - Главен Отметнати плейлисти - Добави към - Използвай бързо, но неточно превъртане Неточното превъртане позволява на плейъра да превърта кадри по-бързо, с намалена прецизност Зареждай миниатюри @@ -222,26 +199,24 @@ Премахни всички метаданни за уебстраници от кеш-паметта Кеш-паметта с метаданни бе изтрита Автоматично нареди на опашка следващия - Автоматично прибавяне на сродно съдържание при неповтарящ се преглед. + Автоматично прибавяне на сродно съдържание при неповтарящ се преглед Държава, за която да бъде показвано съдържание Услуга Отстраняване на грешки Винаги Само веднъж Файл - Смени ориентацията Мини във фонов режим Мини към нов прозорец Мини в основен режим - Импортиране на база данни Експортиране на база данни Замества текущите история и абонаменти Експортиране на историята, абонаментите и плейлистите Изтрий историята с изгледани Изтрий цялата история с изгледани\? - Историята с изгледани е изтрита. + Историята с изгледани е изтрита. Изтрий историята на търсенията Изтрива историята с въвежданите за търсене ключови думи Изтрий цялата история на търсенията\? @@ -255,17 +230,14 @@ Името на файла не може да бъде празно Възникна грешка: %1$s Не са налични източници за изтегляне - хил. млн. млрд. - Няма абонати Създай Изтрий всички Откажи Няма инсталирано приложение, което да изпълни този файл - © %1$s от %2$s под лиценза %3$s Съдействайте За всичко, което се сетите: превод, промени по дизайна, изчистване на кода или много сериозни промени по кода – помощта е винаги добре дошла. Колкото повече развитие, толкова по-добре! @@ -289,28 +261,21 @@ Миниатюра на видео Потребителски доклад Пренареди чрез плъзгане - Начало Изтрий един Преименувай - Нова цел Моля, изберете достъпна папка за изтегляния Това разрешение се изисква за \nвъзпроизвеждане в отделен прозорец 1 елемент е изтрит. - преКАПЧА reCAPTCHA заявка Изисква се въвеждане на reCAPTCHA - Изтегляне Повечето специални символи - NewPipe е безплатен „copyleft“ софтуер: Можете да го използвате, изучавате, споделяте и подобрявате по желание. В частност, Вие можете да препубликувате и/или модифицирате приложението според правилата на Главния обществен лиценз на ГНУ, издаден от Фондацията за свободен софтуер – версия 3 на лиценза или по-нова. Прочетете лиценза - - История Търсения Гледани @@ -324,7 +289,6 @@ Окончателно ли искате да изтриете всички елементи от историята на гледанията? Последно възпроизвеждани Най-възпроизвеждани - Съдържание на главната страница Празна страница Страница-павилион @@ -340,7 +304,6 @@ Внимание: не всички файлове бяха импортирани успешно. Това ще замени текущата Ви инсталация. Желаете ли също да импортирате настройките? - Павилион Набиращи популярност Топ 50 @@ -356,68 +319,50 @@ Възпроизвеждане от тук Възпроизвеждане от тук при фонов режим Възпроизвеждане от тук при прозорец - Отвори навигационната лента Затвори навигационната лента Тук нещо ще се появи скоро ;D - - Действие при повикване от друго приложение Действие по подразбиране при отваряне на съдържание — %s - Видео плейър Във фонов режим В прозорец Винаги питай - Получаване на инфо… Зареждане на заявеното съдържание - Нов Плейлист Изтрий "Преименувай " Име Добави Към Плейлист Задай като миниатюра на плейлиста - Миниатюрата на плейлиста е сменена Премахни отметката - Искате ли да изтриете този плейлист? Плейлистът е създаден Добавено към плейлист Миниатюрата на плейлиста е сменена. Плейлистът не можа да бъде изтрит. - Без надписи - Приспособи Запълни Увеличи - Авто-генерирани - Надписи Модифицирай мащаба на текста и фона на надписите. Изисква рестарт на приложението, за да се приложат промените. - Включи LeakCanary Следенето за пропускане на памет може да направи приложението нестабилно - Докладвай за извънредни грешки Импортиране/Експортиране Импортирай Импортирай от Експортирай в - Импортиране… Експортиране… - Файл с данни за импортиране Предишно експортиране - Неуспешно импортиране на абонатите Неуспешно експортиране на абонатите - Импортирайте YouTube абонаментите, чрез изтегляне на нужния файл: \n \n1. Посетете тази връзка: %1$s @@ -430,11 +375,9 @@ \n3. Влезте в профила си, ако се изисква \n4. Копирайте хипервръзката на профилната страница, към която сте насочени. вашиятID, soundcloud.com/вашиятID - Това действие може да изразходва голямо количество данни от вашия трафик. \n \nЖелаете ли да продължите? - Управление скоростта на възпроизвеждане Темпо Височина @@ -443,7 +386,6 @@ \nТрябва да сте съгласни с условията, за да ни изпратите доклада за грешката. Приеми Откажи - Без ограничения Ограничена резолюция при мобилни данни Минимизирай при преход към друго приложение @@ -451,15 +393,26 @@ Без минимизиране Минимизирай във фонов режим Минимизирай в прозорец - -Канали + Канали Плейлисти Песни Потребители Възстанови - Стъпка Насили докладването на неизпращаеми Rx изключения извън фрагмента или кръговрата на активност след приключване - Откачи (може да предизвика промени) - + Отписване + Контрол на звука с жестове + Променяйте звука на плейъра с жестове + Контрол на яркостта с жестове + Променяйте яркостта на плейъра с жестове + Файлът е изтрит + Събития + Показвай коментари + Деактивиране за скриване на коментарите + Автоматично пускане + + Коментари + + + \ No newline at end of file diff --git a/app/src/main/res/values-bn-rBD/strings.xml b/app/src/main/res/values-bn-rBD/strings.xml index cdf4f2e1053..3a623f2c322 100644 --- a/app/src/main/res/values-bn-rBD/strings.xml +++ b/app/src/main/res/values-bn-rBD/strings.xml @@ -1,14 +1,14 @@ শুরু করতে অনুসন্ধান এ আলতো চাপ - %1$s বার দেখা হয়েছে + "%1$s জন দেখছে" প্রকাশকাল %1$s কোন স্ট্রিম প্লেয়ার পাওয়া যায়নি। তুমি কি VLC ইনস্টল করতে চাও? ইনস্টল - "বাদ দিন " + বাদ দিন - "ব্রাউজারে ওপেন করো " - "পপ-আপ মোডে ওপেন করো " + ব্রাউজারে ওপেন করো + পপ-আপ মোডে ওপেন করো শেয়ার ডাউনলোউড খুঁজুন diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index a90c8be6f69..ee48181c8f0 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -6,7 +6,7 @@ Comparteix Baixa Cerca - Configuració + Paràmetres Tria un navegador Subscriu-t\'hi Subscrit @@ -14,7 +14,7 @@ Subscripcions Llistes de reproducció desades Novetats - Ruta de baixada dels vídeos + Carpeta de baixada dels vídeos Carpeta de baixada dels fitxers d\'àudio Reproducció automàtica Resolució per defecte @@ -25,7 +25,7 @@ Clar Fosc Negre - Historial i memòria cau + Historial de reproduccions Baixa Servei Reproductor @@ -37,7 +37,7 @@ Depuració Contingut Desactiva les restriccions per edat - Mostra el vídeo restringit per edat. Podeu permetre aquesta mena de continguts des de la configuració. + Mostra el vídeo restringit per edat. Pots permetre aquesta mena de continguts des dels paràmetres. EN DIRECTE Baixades Baixades @@ -69,7 +69,7 @@ Error reCAPTCHA Baixades - Configuració + Paràmetres Quant a Llicències de tercers No s\'ha pogut carregar la llicència @@ -87,9 +87,9 @@ L\'historial és buit S\'ha esborrat l\'historial S\'ha eliminat l\'element - Voleu eliminar aquest element de l\'historial de cerca? - Voleu eliminar aquest element de l\'historial de reproduccions? - Segur que voleu eliminar tots els elements de l\'historial? + Vols eliminar aquest element de l\'historial de cerca\? + Vols eliminar aquest element de l\'historial de reproduccions\? + Segur que vols eliminar tots els elements de l\'historial\? Contingut de la pàgina principal Pàgina en blanc Pàgina de subscripcions @@ -98,7 +98,7 @@ S\'ha completat la importació Elimina Detalls - Configuració d\'àudio + Paràmetres d\'àudio Reproductor de vídeo Reproductor en segon pla Reproductor emergent @@ -117,32 +117,32 @@ Per defecte %1$s reproduccions Publicat el %1$s - No s\'ha trobat un reproductor de fluxos. Voleu instal·lar el VLC? - No s\'ha trobat cap reproductor de fluxos (podeu instal·lar el VLC per reproduir-lo). + No s\'ha trobat un reproductor de fluxos. Vols instal·lar el VLC\? + No s\'ha trobat cap reproductor de fluxos (pots instal·lar el VLC per reproduir-lo). Obre en mode emergent Baixa el fitxer de vídeo - Volíeu dir: %1$s? + Volies dir: %1$s\? Comparteix-ho amb rotació Reproductor de vídeo extern Mode emergent del NewPipe - Heu eliminat la subscripció d\'aquest canal + Has eliminat la subscripció d\'aquest canal No s\'ha pogut modificar la subscripció No s\'ha pogut actualitzar la subscripció Principal Segon pla Emergent Afegeix a - Ruta on es desaran els vídeos baixats - Introduïu una ruta de baixada per als vídeos - Els fitxers d\'àudio baixats es desaran aquí - Introduïu una ruta de baixada per als fitxers d\'àudio + Els fitxers de vídeo baixats s\'emmagatzemen aquí + Tria la carpeta de baixades per als fitxers de vídeo + Els fitxers d\'àudio baixats es desen aquí + Tria la carpeta de baixada per als fitxers d\'àudio Reprodueix un vídeo quan el NewPipe s\'executa des d\'una altra aplicació Resolució per defecte del mode emergent Mostra resolucions superiors Només alguns dispositius són compatibles amb la reproducció de vídeos en 2K/4K Reprodueix amb Kodi - No s\'ha trobat l\'aplicació Kodi. Voleu instal·lar-la? + No s\'ha trobat l\'aplicació Kodi. Vols instal·lar-la\? Activa «Reprodueix amb Kodi» Mostra una opció per reproduir un vídeo amb el centre multimèdia Kodi Reproductor emergent intel·ligent @@ -223,8 +223,8 @@ Sense vídeos - Vídeo - Vídeos + %s vídeo + %s vídeos Pausa Reprodueix @@ -239,7 +239,7 @@ Servidor incompatible El fitxer ja existeix Baixada del NewPipe activa - Espereu… + Espera… S\'ha copiat al porta-retalls Caràcters permesos als noms de fitxer Lletres i dígits @@ -248,8 +248,8 @@ Reprodueix transmissions de manera lliure i lleugera a l\'Android. Visualitza a GitHub Fes una donació - Per a més informació i notícies, visiteu el nostre lloc web. - Última reproducció + Per a més informació i notícies, visita el nostre lloc web. + Últimes reproduccions Més reproduïts Pàgina d\'un quiosc Pàgina de novetats @@ -257,7 +257,7 @@ Tria un quiosc El fitxer no té un format ZIP vàlid Avís: No s\'han pogut importar tots els fitxers. - Això sobreescriurà la configuració actual. + Això sobreescriurà els paràmetres actuals. Quiosc Tendències Els millors 50 @@ -270,16 +270,16 @@ Tanca el calaix S\'està obtenint la informació… S\'està carregant el contingut seleccionat - Voleu eliminar aquesta llista de reproducció? + Vols eliminar aquesta llista de reproducció\? No s\'ha pogut eliminar la llista de reproducció. Importació i exportació Controls de la velocitat de reproducció Tempo To - Toqueu el botó de cerca per començar + Toca el botó de cerca per començar Elimina l\'àudio en algunes resolucions Reproductor d\'àudio extern - Desactiveu-ho per evitar que es carreguin les miniatures i estalviar dades i memòria. Si canvieu aquesta opció, s\'esborrarà la memòria cau d\'imatges tant de la memòria com de l\'emmagatzematge. + Desactiva-ho per evitar que es carreguin les miniatures i estalviar dades i memòria. Si canvies aquesta opció, s\'esborrarà la memòria cau d\'imatges tant de la memòria com de l\'emmagatzematge. Emmagatzema les cerques localment Registra els vídeos visualitzats Reprèn automàticament @@ -297,31 +297,31 @@ Sobreescriu l\'historial i les subscripcions actuals S\'està recuperant el reproductor després de l\'error Ho sentim, això no hauria d\'haver ocorregut. - Arrossegueu per a reordenar la llista + Arrossega per a reordenar la llista mil milions mil milions Inicia Nova missió L\'URL té un format incorrecte o no hi ha connexió a internet - Toqueu aquí per a més detalls - Trieu una carpeta de baixades disponible + Toca aquí per a més detalls + Defineix una carpeta de baixades més endavant als paràmetres Es necessita aquest permís per a obrir el mode emergent Camp reCAPTCHA S\'ha sol·licitat l\'emplenament d\'un camp reCAPTCHA Se substituiran els caràcters no vàlids amb aquest valor Caràcter de substitució Principals caràcters especials - Ja siguin idees, traduccions, canvis en el disseny, una neteja del codi o canvis importants de programació, la vostra ajuda sempre és benvinguda. Com més feina feta hi hagi, millor! - El NewPipe està desenvolupat per voluntaris que fan servir el seu temps lliure per a oferir-vos la millor experiència possible. Feu una aportació per assegurar que els nostres desenvolupadors puguin millorar encara més el NewPipe mentre fan un cafè. + Ja siguin idees, traduccions, canvis en el disseny, una neteja del codi o canvis importants de programació, la teva ajuda sempre és benvinguda. Com més feina feta hi hagi, millor! + El NewPipe està desenvolupat per voluntaris que fan servir el seu temps lliure per a oferir-te la millor experiència possible. Fes una aportació per assegurar que els nostres desenvolupadors puguin millorar encara més el NewPipe mentre fan un cafè. Fes la teva aportació Cerques Reproduccions - Encara no us heu subscrit a cap canal + Encara no t\'has subscrit a cap canal Novetats - Manteniu premut per afegir a la cua - Reprodueix aquí en segon pla - Reprodueix aquí en mode emergent + Mantén premut per afegir a la cua + Comença a reproduir en segon pla + Comença a reproduir en mode emergent Defineix com a miniatura de la llista de reproducció Afegeix la llista de reproducció a les adreces d\'interès Elimina l\'adreça d\'interès @@ -333,18 +333,13 @@ Omple Escala Generats automàticament - Mida dels subtítols - Mida més petita - Mida normal - Mida més gran Habilita el LeakCanary Darrera exportació No s\'han pogut importar les subscripcions No s\'han pogut exportar les subscripcions Desvincula (pot provocar distorsió) - Nightcore Elimina totes les dades de llocs web de la memòria cau - Afegeix a la cua un vídeo relacionat quan es reprodueix l\'últim vídeo en una cua sense repetició. + Afegeix a la cua un vídeo relacionat quan es reprodueix l\'últim vídeo en una cua sense repetició Mostra els missatges d\'ajuda Mostra un missatge d\'ajuda quan el botó de mode en segon pla o emergent estigui premut a la pàgina de detalls d\'un vídeo Què ha passat:\\nPetició:\\nIdioma del contingut:\\nServei:\\nHora GMT:\\nPaquet:\\nVersió:\\nVersió del SO: @@ -354,42 +349,42 @@ "La supervisió de fugues de memòria pot fer que l\'aplicació deixi de respondre mentre es bolca la memòria " Informa d\'errors fora del cicle de vida Força l\'informe d\'excepcions Rx que no es puguin transmetre que tinguin lloc fora del cicle de vida d\'un fragment o activitat després de disposar-los - Importeu les vostres subscripcions de YouTube mitjançant el fitxer d\'exportació: + Importa les teves subscripcions de YouTube mitjançant el fitxer d\'exportació: \n -\n1. Aneu a aquesta URL: %1$s -\n2. Inicieu sessió quan se us demani +\n1. Vés a aquesta URL: %1$s +\n2. Inicia la sessió quan se\'t demani \n3. S\'hauria d\'iniciar una baixada (el fitxer d\'exportació) - Importeu un perfil de SoundCloud mitjançant l\'URL o l\'identificador del vostre perfil: + Importa un perfil de SoundCloud mitjançant l\'URL o l\'identificador del teu perfil: \n -\n1. Activeu el «Mode d\'ordinador» en un navegador (el lloc web no està disponible per a dispositius mòbils) -\n2. Aneu a aquesta URL: %1$s -\n3. Inicieu sessió al vostre compte quan se us demani -\n4. Copieu l\'URL de la pàgina on se us redireccioni +\n1. Activa el «Mode d\'ordinador» en un navegador (el lloc web no està disponible per a dispositius mòbils) +\n2. Vés a aquesta URL: %1$s +\n3. Inicia la sessió al teu compte quan se\'t demani +\n4. Copia l\'URL de la pàgina on se\'t redireccioni identificador, soundcloud.com/identificador - Tingueu en compte que això pot comportar un ús intensiu de la xarxa. -\n -\nVoleu continuar? + Tingues en compte que això pot comportar un ús intensiu de la xarxa. +\n +\nVols continuar\? No hi ha vídeos que es puguin baixar Subtítols Modifica la mida del text i el fons dels subtítols. Cal reiniciar l\'aplicació per aplicar els canvis. No s\'ha trobat cap aplicació que pugui reproduir aquest fitxer Esborra l\'historial de reproduccions - Esborra l\'historial dels vídeos que s\'han reproduït - Voleu esborrar tot l\'historial de reproduccions\? - S\'ha esborrat l\'historial de reproduccions. + Esborra l\'historial dels vídeos reproduïts i les posicions de reproducció + Vols esborrar tot l\'historial de reproduccions\? + S\'ha esborrat l\'historial de reproduccions. Esborra l\'historial de cerca Esborra l\'historial de paraules cercades - Voleu esborrar tot l\'historial de cerca\? + Vols esborrar tot l\'historial de cerca\? S\'ha esborrat l\'historial de cerca. S\'ha esborrat 1 element. - NewPipe és programari lliure sota llicència copyleft: podeu fer-lo servir, estudiar-lo, compartir-lo i millorar-lo al vostre gust. En concret, podeu redistribuir-lo i/o modificar-lo d\'acord amb els termes de la llicència GNU GPL publicada per la Free Software Foundation, ja sigui la versió 3 o (segons vulgueu) qualsevol altra versió posterior. - Voleu importar també la configuració? + NewPipe és programari lliure sota llicència copyleft: pots fer-lo servir, estudiar-lo, compartir-lo i millorar-lo al teu gust. En concret, pots redistribuir-lo i/o modificar-lo d\'acord amb els termes de la llicència GNU GPL publicada per la Free Software Foundation, ja sigui la versió 3 o (segons vulguis) qualsevol altra versió posterior. + Vols importar també els paràmetres\? Política de privacitat del NewPipe - El projecte NewPipe es pren molt seriosament la vostra privacitat. Per aquesta raó, l\'aplicació no emmagatzema cap mena de dades sense el vostre consentiment. -\nLa política de privacitat del NewPipe descriu detalladament quines dades s\'envien i s\'emmagatzemen quan envieu un informe d\'error. + El projecte NewPipe es pren molt seriosament la teva privacitat. Per aquesta raó, l\'aplicació no emmagatzema cap mena de dades sense el teu consentiment. +\nLa política de privacitat del NewPipe descriu detalladament quines dades s\'envien i s\'emmagatzemen quan envies un informe d\'error. Llegeix la política de privacitat - Per tal de complir amb el Reglament General de Protecció de Dades europeu (GDPR), us demanem que poseu atenció a la política de privacitat del NewPipe. Llegiu-la detingudament. -\nSi voleu enviar-nos un informe d\'error, l\'haureu d\'acceptar. + Per tal de complir amb el Reglament General de Protecció de Dades europeu (GDPR), et demanem que posis atenció a la política de privacitat del NewPipe. Llegeix-la detingudament. +\nSi vols enviar-nos un informe d\'error, l\'hauràs d\'acceptar. Accepta Rebutja Sense restriccions @@ -416,7 +411,7 @@ S\'ha eliminat el fitxer L\'emmagatzematge extern no està disponible Reinicialitza els valors per defecte - Voleu reinicialitzar els valors per defecte\? + Vols reinicialitzar els valors per defecte\? Selecció Actualitzacions Llista @@ -455,6 +450,43 @@ Neteja les baixades finalitzades Intents màxims Nombre màxim d\'intents abans de cancel·lar la baixada - Pausa en canviar a dades mòbils - Les baixades que no es puguin pausar es tornaran a iniciar + Interromp en connexions limitades + Útil en canviar a les dades mòbils, tot i que algunes baixades no es poden aturar + Elimina la subscripció + Sobreescriu + No s\'ha trobat + Mostra els comentaris + Desactiva-ho per deixar de mostrar els comentaris + Reproducció automàtica + No hi ha comentaris + No s\'han pogut carregar els comentaris + Tanca + S\'estan utilitzant les pestanyes per defecte, s\'ha produït un error en llegir les pestanyes desades + Mostra una notificació per demanar l\'actualització de l\'aplicació si hi ha una nova versió disponible + Toca per baixar + El servidor no està enviant dades + + Comentaris + + + Notificació d\'actualització de l\'aplicació + Reprèn la reproducció + No es pot sobreescriure el fitxer + Hi ha una baixada pendent amb aquest nom + No hi ha espai disponible al dispositiu + S\'ha perdut el progrés perquè s\'ha eliminat el fitxer + S\'ha excedit el temps d\'espera de la connexió + Segur\? + Limita la cua de baixades + Inicia les baixades + Pausa les baixades + Se us demanarà la ubicació de cada baixada + Posicions a les llistes + Mostra els indicadors de posició de reproducció a les llistes + Neteja les dades + El sistema ha denegat l\'acció + Reprèn les teves %s baixades pendents des de Baixades + S\'ha tancat el NewPipe mentre es treballava en el fitxer + Pregunta on baixar + Canvia les carpetes de baixada perquè tingui efecte \ No newline at end of file diff --git a/app/src/main/res/values-cmn/strings.xml b/app/src/main/res/values-cmn/strings.xml index e460f55080e..49801a1909d 100644 --- a/app/src/main/res/values-cmn/strings.xml +++ b/app/src/main/res/values-cmn/strings.xml @@ -35,12 +35,12 @@ 转到后台 悬浮窗 添加到 - 视频下载路径 - 储存视频文件的路径 - 输入视频的下载地址 - 音频下载的路径 - 下载音频的储存路径 - 输入音频的下载路径 + 视频下载文件夹 + 已下载的视频储存在此处 + 选择视频文件的下载文件夹 + 音频下载文件夹 + 已下载的音频存储在此处 + 选择音频文件的下载文件夹 自动播放 NewPipes被其它程序调用时播放视频 默认分辨率 @@ -92,7 +92,7 @@ 第三方执照 打开网页 删除书签 - 确定要删除该播放列表吗？ + 确定删除该播放列表吗？ 已创建播放列表 播放列表 步骤 @@ -115,14 +115,14 @@ 已清除缓存的元数据 不加载缩略图时，可以节省数据和存储空间。更改后将清除存储空间和扩展空间的缓存。 自动排列下一个媒体 - 在非重复排列中播放最后一个媒体时，自动推荐相关媒体。 + 在非重复排列中播放最后一个媒体时自动推荐相关媒体 玩家手势控制 使用手势控制播放器的亮度和音量 搜索建议 搜索时显示建议 搜索历史记录 在本地存储搜索 - 历史记录和缓存数据 + 观看历史 记录观看过的视频 取得视窗焦点时继续播放 在被打断后继续播放（例如有来电） @@ -134,7 +134,6 @@ 不支持该网址 默认内容的国家 服务 - 默认内容的语言 播放器 行为 视频与音频 @@ -186,9 +185,9 @@ 导出数据库 覆盖您当前的历史记录和订阅 导出历史记录、订阅和播放列表 - 删除播放过的媒体历史记录 + 删除播放过的媒体的历史记录及回放位置 确定要清除所有观看历史记录吗？ - 观看历史记录已清除。 + 观看历史记录已清除。 清除搜索历史记录 清除搜索关键词的历史记录 确定要清除所有搜索历史记录吗？ @@ -242,7 +241,7 @@ 手机存储访问权限被拒绝 千 万 - 亿 + 十亿 没有订阅者 %s 位订阅者 @@ -254,10 +253,6 @@ 没有视频 - - 部视频 - - 删除 校验 退出 @@ -267,7 +262,7 @@ 错误的网址或网络不可用 点按以查看详细信息 复制到剪贴板 - 请选择下载文件夹 + 请稍后在设置中定义一个下载文件夹 在悬浮窗模式打开 \n需要此权限 已删除一个项目。 @@ -336,20 +331,20 @@ 移除 详细 音频设置 - 长按以新增至队列 - 转到后台时排列 - 排列新的悬浮窗 + 长按加入队列 + 加入后台播放列表 + 加入悬浮窗播放列表 从这里开始播放 - 转到后台时从这里开始 - 从新的悬浮窗开始 + 开始在后台播放 + 开始在新悬浮窗播放 打开抽屉 关闭抽屉 - 某些东西即将在此出现；D + 很快就会出现在这里 ;D 偏好的「开启」动作 开启内容时的默认动作 - %s 视频播放器 - 转到后台播放 - 悬浮窗播放 + 后台播放器 + 悬浮窗播放器 总是询问 正在获取信息… 正在载入请求的内容 @@ -363,12 +358,12 @@ 播放列表缩略图已更改。 无法删除播放列表。 没有字幕 - 合适的 + 合适 填满 缩放 自动生成 字幕 - 修改播放器标题文本比例和背景样式。需要重启才能生效。 + 修改播放器字幕文本比列和背景样式。需要重启才能生效。 启用 LeakCanary 内存泄漏监视可能导致应用程序在存储时无响应 报告活动周期外错误 @@ -416,7 +411,7 @@ 应用升级通知 新 NewPipe 版本通知 外储存不可行 - 下载至外置SD卡还未可行。重置下载文件夹位置？ + 无法下载到外部SD卡。重置下载文件夹位置？ 恢复默认 您真的要恢复至默认吗？ 选择 @@ -452,7 +447,7 @@ 停 重试上限 取消下载前可以尝试的最多次数 - 换成手机数据时暂停 + 换成手机数据时中断 事件 使用默认选项卡, 读取保存的选项卡时出错 订阅者计数不可用 @@ -464,8 +459,48 @@ 切换视图 NewPipe 更新可用! 无法创建目标文件夹 - 服务器不接受多线程下载, 请重试使用 @string/msg_threads = 1 + 服务器不接受多线程下载, 请使用 @string/msg_threads = 1重试 请求范围无法满足 继续进行%s个待下载转移 - 无法暂停的下载将重新开始 + 切换至移动数据时有用，尽管一些下载无法被暂停 + 显示评论 + 禁用停止显示评论 + 自动播放 + + 评论 + + + 没有评论 + 无法加载评论 + 关闭 + 继续播放 + 恢复上次播放位置 + 列表中的位置 + 在列表中显示播放位置指示符 + 清除数据 + 播放位置已删除。 + 文件被移动或删除 + 已存在具有此名称的文件 + 无法覆盖该文件 + 同名文件正在等待下载 + 处理此文件时 NewPipe 已关闭 + 设备上没有剩余空间 + 进度丢失，因为文件已被删除 + 连接超时 + 你确定吗？ + 限制下载队列 + 同时只有一个下载进行 + 开始全部下载 + 暂停全部下载 + 询问下载位置 + 每次下载将询问保存的位置 + 每次下载将询问保存的位置. +\n如果要下载到外部SD卡，请选择外部存储访问框架 + 使用存储访问框架 + 存储访问框架(SAF)允许下载文件到外部SD卡。 +\n注：一些设备不兼容SAF + 删除回放位置 + 删除所有回放位置 + 删除所有的回放位置吗？ + 更改要生效的下载文件夹 \ No newline at end of file diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 6869808838b..0a760af4014 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -16,15 +16,15 @@ Použít externí video přehrávač Použít externí audio přehrávač Stažené audio je uloženo zde - Zadejte umístění pro stažené audio soubory + Zvolte adresář pro stažené audio soubory Složka pro stažené audio Výchozí rozlišení Přehrát pomocí Kodi Aplikace Kore nenalezena. Chcete ji nainstalovat? %1$s zhlédnutí - Umístění pro stažené video - Cesta, kam se uloží stažené video - Zadejte umístění pro stažená videa + Adresář pro stažená videa + Stažená videa jsou uložena tady + Zvolte adresář pro stažená videa Zobrazit možnost \"Přehrát pomocí Kodi\" Zobrazit možnost přehrání videa pomocí multimediálního centra Kodi Zvuk @@ -33,7 +33,7 @@ Tmavé Světlé Stáhnout - Další videa + Další Zobrazovat \'další\' a \'podobná\' videa URL není podporováno Preferovaný jazyk obsahu @@ -48,8 +48,6 @@ Nebylo možné dekódovat URL videa Nebylo možné analyzovat stránku Obsah není k dispozici - - Náhled videa Náhled videa Náhled avataru uploadera @@ -109,7 +107,7 @@ Požadována výzva reCAPTCHA Černé Kontrolní součet - Prosím vyberte dostupnou složku pro stahování + Určete prosím složku pro stahování později v nastavení Hlášení uživatele Co:\\nŽádost:\\nJazyk obsahu:\\nSlužba:\\nČas GMT:\\nBalíček:\\nVerze:\\nVerze OS: Vše @@ -145,7 +143,7 @@ otevření ve vyskakovacím okně Zobrazovat návrhy při vyhledávání Historie vyhledávání Hledané výrazy lokálně uchovávat - Historie & mezipaměť + Historie zhlédnutí Evidovat zhlédnutá videa Přehrávat po přechodu do popředí Pokračovat v přehrávání po přerušení (např. hovor) @@ -247,8 +245,8 @@ otevření ve vyskakovacím okně Do fronty na pozadí Do fronty v okně Začne hrát zde - Začne zde, když na pozadí - Začne zde v okně + Začít přehrávat na pozadí + Začít přehrávat v okně Donate NewPipe je vyvíjen dobrovolníky, kteří tráví svůj čas, aby vaše zkušenost s aplikací byla co nejlepší. Vraťte vývojářům něco zpět, aby mohli NewPipe dále zlepšovat a zároveň si vychutnat šálek kávy. Daruj @@ -257,7 +255,7 @@ otevření ve vyskakovacím okně Země výchozího obsahu Služba Změna orientaci - Na pozadí + Přepnout na pozadí Do okna Přepnout na hlavní Otevřít Drawer @@ -316,14 +314,7 @@ otevření ve vyskakovacím okně Přizpůsobit Vyplnit Zvětšit - Velikost písma nadpisu - Menší písmo - Normální písmo - Větší písmo - Sledovat únik paměti - Sledování úniku paměti vypnuto - Sledování úniku paměti povoleno, aplikace může při zátěži přestat reagovat Ladění "Automaticky generováno " Povolit službu LeakCanary @@ -339,7 +330,7 @@ otevření ve vyskakovacím okně Odebrat všechna data uložená v mezipaměti Mezipaměť metadat vymazána Automatická fronta dalšího streamu - Automaticky připojí související stream při přehrávání posledního streamu v neopakující se frontě. + Automaticky připojí související stream při přehrávání posledního streamu v neopakující se frontě Soubor Neexistující složka Neexistující zdroj souboru/obsahu @@ -378,7 +369,6 @@ otevření ve vyskakovacím okně Rychlost Výška tónu Rozpojit (může způsobit zkreslení) - Nightcore mód Výchozí nastavení Ke stažení nejsou dostupné žádné streamy Preferovaná \'otevřít\' akce @@ -387,9 +377,9 @@ otevření ve vyskakovacím okně Upravuje velikost textu titulků a styly pozadí. Změny se projeví po restartu aplikace. K přehrání tohoto souboru chybí vhodná aplikace Vymazat historii sledování - Vymaže historii přehrávaných streamů + Vymaže historii přehraných streamů pozic playbacku Vymazat celkovou historii sledování\? - Historie sledování smazána. + Historie sledování smazána. Vymazat historii vyhledávání Vymaže historii vyhledávaných klíčových slov Vymazat celkovou historii vyhledávání\? @@ -449,7 +439,7 @@ otevření ve vyskakovacím okně K dispozici je aktualizace aplikace NewPipe! Klepněte pro stažení Hotovo - Ve frontě + Vyčkávání Pozastaveno ve frontě post-processing @@ -457,7 +447,7 @@ otevření ve vyskakovacím okně Akce odmítnuta systémem Stahování se nezdařilo Stahování dokončeno - % s stahování dokončeno + %s stahování dokončeno Vytvořit jedinečný název Přepsat Stažený soubor s tímto názvem již existuje @@ -465,8 +455,8 @@ otevření ve vyskakovacím okně Stahování s tímto názvem již probíhá Zobrazit chybu Kód - Soubor nelze vytvořit - Cílovou složku nelze vytvořit + Cílovou složku nelze vytvořit + Soubor nelze vytvořit Oprávnění odepřeno systémem Zabezpečené připojení selhalo Server se nepodařilo najít @@ -481,6 +471,47 @@ otevření ve vyskakovacím okně Zastavit Maximální počet pokusů o opakování Maximální počet pokusů před zrušením stahování - Pozastavit při přepnutí na mobilní data - Stahování, která nelze pozastavit, budou restartována + Přerušit na mobilních sítích + Užitečné při přepnutí na mobilní data, některá stahování ale nelze přerušit + Zobrazit komentáře + Deaktivovat zobrazování komentářů + Automatické přehrávání + + Komentáře + + + + Žádné komentáře + Nelze načíst komentáře + Zavřít + Stahování na externí SD kartu není možné. Resetovat umístění složky pro stahování\? + Pokračovat v přehrávání + Obnovit poslední přehrávanou pozici + Pořadí v seznamech + Vymazat data + Soubor přemístěn nebo smazán + soubor nelze přepsat + Soubor s tímto názvem již čeká na stažení + NewPipe byl ukončen v průběhu zpracovávání souboru + V zařízení nezbývá žádné místo + Postup ztracen, protože soubor byl smazán + Jste si jisti\? + Omezit frontu stahování + Najednou se bude stahovat pouze jeden soubor + Začít stahování + Pozastavit stahování + Zeptat se na složku pro stahování + Budete dotázáni, kam jednotlivé soubory stáhnout + Budete dotázáni, kam jednotlivé soubory stáhnout. +\nZvolte SAF, pokud si přejete stahovat na externí SD kartu + Použít SAF + Storage Access Framework umožňuje stahovat na externí SD kartu. +\nUpozornění: některá zařízení jsou nekompatibilní + Ukázat poziční indikátory playbacku v seznamech + Pozice playbacku smazány. + Timeout spojení + Smazat pozice playbacku + Smazat všechny pozice playbacku + Smazat všechny pozice playbacku\? + Změnit adresář pro stažené soubory \ No newline at end of file diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 7a051e7a8c9..42ffd474b8f 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -123,8 +123,8 @@ Playliste Playlister - Video - Videoer + Én video + %s videoer Numre Brugere @@ -158,7 +158,7 @@ Slet visningshistorik Sletter historikken for viste videoer Slet hele visningshistorikken\? - Visningshistorikken blev slettet. + Visningshistorikken blev slettet. Slet søgehistorik Sletter historikken for søgeord Slet hele søgehistorikken\? diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index fceb18289b1..49fcc45066f 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -2,7 +2,7 @@ %1$s Aufrufe Veröffentlicht am %1$s - Keinen Stream-Player gefunden. Möchtest Du VLC installieren\? + Keinen Stream-Player gefunden. Möchtest du VLC installieren\? Installieren Abbrechen \n @@ -15,9 +15,9 @@ Teilen mit Browser auswählen Drehen des Geräts - Downloadverzeichnis für Videos - Verzeichnis für heruntergeladene Videos - Downloadverzeichnis für Videos angeben + Downloadordner für Videos + Heruntergeladene Videodateien werden hier gespeichert + Wähle den Downloadordner für Videodateien aus Standardauflösung Mit Kodi abspielen Kore App wurde nicht gefunden. Kore jetzt installieren? @@ -26,26 +26,26 @@ Audio Bevorzugtes Audioformat Herunterladen - Nächstes + Nächste \'Nächste\' und \'ähnliche\' Videos anzeigen Nicht unterstützte URL Video & Audio Bevorzugte Sprache des Inhalts Video-Vorschaubild - Video-Vorschaubild + Video abspielen, Dauer: Nutzerbild Gefällt nicht Gefällt Externen Video-Player verwenden Externen Audio-Player verwenden - Spiele im Hintergrund ab + Im Hintergrund abspielen Abspielen - Benutze Tor + Tor benutzen (Experimentell) Erzwinge das Herunterladen über Tor für verbesserte Privatsphäre (Videostream werden noch nicht unterstützt). Netzwerkfehler - Downloadverzeichnis für Audiodateien + Downloadordner für Audiodateien Heruntergeladene Audiodateien werden hier gespeichert - Downloadverzeichnis für Audiodateien angeben + Wähle den Downloadordner für Audiodateien aus Design Dunkel Hell @@ -58,7 +58,6 @@ Konnte Video-URL-Signatur nicht entschlüsseln Konnte Webseite nicht analysieren Inhalt nicht verfügbar - Inhalt Altersbeschränkte Inhalte Altersbeschränktes Video anzeigen. Das Zulassen dieses Materials ist von den Einstellungen aus möglich. @@ -98,7 +97,7 @@ Datei existiert bereits Bitte warten… In Zwischenablage kopiert - Bitte wähle ein verfügbares Downloadverzeichnis + Bitte gib später in den Einstellungen einen Downloadverzeichnis an Starten Pause Abspielen @@ -122,7 +121,7 @@ Deaktiviert Im Pop-up-Modus öffnen Bevorzugtes Videoformat - Spiele im Pop-up Modus ab + Im Pop-up Modus abspielen NewPipe-Pop-up-Modus Diese Berechtigung ist für das Öffnen im Pop-up-Modus erforderlich Standardauflösung des Pop-ups @@ -131,7 +130,7 @@ Hintergrund Pop-up Größe und Position des Pop-ups merken - Entfernt Tonspur bei manchen Auflösungen + Entfernt Tonspur bei MANCHEN Auflösungen Letzte Größe und Position des Pop-ups merken Gestensteuerung Helligkeit und Lautstärke mittels Gesten einstellen @@ -166,12 +165,12 @@ Buchstaben und Zahlen Abonnieren Abonniert - Abonnement beendet + Kanal abbestellt Abos Neuigkeiten Suchverlauf Suchanfragen lokal speichern - Verlauf & Cache + Verlauf ansehen Speichere den Wiedergabeverlauf Verlauf Gesucht @@ -203,17 +202,17 @@ Keine Videos - Video - Videos + %s Video + %s Videos Die meisten Sonderzeichen Element gelöscht Fortsetzen bei erneutem Fokussieren Player Nichts hier außer das Zirpen der Grillen - Möchtest du dieses Element aus dem Suchverlauf löschen? + Möchtest Du dieses Element aus dem Suchverlauf löschen\? Leere Seite - Wähle einen Kanal aus + Einen Kanal auswählen Noch keine Kanalabonnements vorhanden Trends In der Warteschlange der Pop-up-Wiedergabe @@ -241,10 +240,10 @@ \"Gedrückt halten, um hinzuzufügen\" Tipp anzeigen [Unbekannt] In Warteschlange für Hintergrundwiedergabe - In Warteschlange für Pop-up + In Warteschlange in neuen Pop-up Ab hier wiedergeben - Ab hier im Hintergrundmodus - Ab hier im Pop-up + Wiedergabe im Hintergrund starten + Wiedergabe in einem neuen Pop-up starten Spenden Zurückgeben Website @@ -277,7 +276,7 @@ Keine gültige ZIP-Datei Warnung: Nicht alle Dateien konnten importiert werden. Dies wird deine aktuellen Einstellungen überschreiben. - Info anzeigen + Infos anzeigen Lesezeichen für Wiedergabelisten Hinzufügen zu Zum Neuordnen ziehen @@ -285,8 +284,8 @@ Einen löschen Alle löschen Umbenennen - Möchtest du dieses Element aus dem Wiedergabeverlauf löschen? - Bist du sicher, dass du alle Elemente aus dem Verlauf löschen möchtest? + Möchtest Du dieses Element aus dem Wiedergabeverlauf löschen\? + Bist Du sicher, dass Du alle Elemente aus dem Verlauf löschen möchtest\? Zuletzt wiedergegeben Am häufigsten wiedergegeben Immer fragen @@ -302,20 +301,16 @@ Vorschaubild der Wiedergabeliste geändert. Konnte Wiedergabeliste nicht löschen. Keine Untertitel - Schriftgröße der Untertitel Abbrechen - Normale Schriftgröße Stream-Datei herunterladen Schnelle, ungenaue Suche verwenden Mit ungenauem Suchen kann die Abspielposition schneller erreicht werden, aber auf Kosten der Genauigkeit Datei - Verzeichnis existiert nicht + Ordner existiert nicht Die Datei existiert nicht oder die Rechte zum Lesen oder Schreiben fehlen Dateiname darf nicht leer sein Ein Fehler ist aufgetreten: %1$s Automatisch erzeugt - Kleinere Schrift - Größere Schrift LeakCanary aktivieren Import von Export nach @@ -325,7 +320,7 @@ Vorheriger Export Beachte, dass diese Aktion das Netzwerk stark belasten kann. \n -\nMöchtest du fortfahren? +\nMöchtest Du fortfahren\? Vorschaubilder laden Bilder-Cache gelöscht Zwischengespeicherte Metadaten löschen @@ -344,7 +339,6 @@ Geschwindigkeit Tonhöhe Verknüpfung aufheben (kann zu Verzerrungen führen) - Nightcore Standard Abschalten, um das Laden von Miniaturansichten zu verhindern, was Daten- und Speicherverbrauch spart. Änderungen löschen den Bildzwischenspeicher sowohl im Arbeitsspeicher als auch auf dem internen Speicher. Nächsten Stream automatisch einreihen @@ -354,20 +348,20 @@ Anpassen Füllen Vergrößern - Speicherlecküberwachung kann dazu führen, dass die App beim Heap-Dumping nicht mehr reagiert + Die Überwachung von Speicherlecks kann dazu führen, dass die App beim Heap-Dumping nicht mehr reagiert Fehler außerhalb des Lebenszyklus melden Erzwingen der Meldung unzustellbarer Rx-Ausnahmen außerhalb des Lebenszyklus von Fragmenten oder Aktivitäten nach der Entsorgung Importiere YouTube-Abonnements, indem du die Exportdatei herunterlädst: \n \n1. Gehe zu dieser URL: %1$s -\n2. Melde dich an, falls du dazu aufgefordert wirst. +\n2. Melde dich an, falls Du dazu aufgefordert wirst. \n3. Der Ladevorgang sollte beginnen (das ist die Exportdatei) Importiere ein SoundCloud-Profil, indem du entweder die URL oder deine ID eingibst: \n \n1. Aktiviere den \"Desktop-Modus\" in einem Web-Browser (die Seite ist für mobile Geräte nicht verfügbar) \n2. Gehe zu dieser URL: %1$s -\n3. Melden dich an, falls du dazu aufgefordert wirst -\n4. Kopiere die Profil-URL, zu der du weitergeleitet wurdest. +\n3. Melden dich an, falls Du dazu aufgefordert wirst +\n4. Kopiere die Profil-URL, zu der Du weitergeleitet wurdest. yourID, soundcloud.com/yourid Keine Streams zum Download verfügbar Bevorzugte \'Öffnen\' Aktion @@ -376,16 +370,16 @@ Textgröße und Hintergrund der Untertitel im Player anpassen. Wird erst nach Neustart der App wirksam. Keine App zum Abspielen dieser Datei installiert Wiedergabeverlauf löschen - Löscht den Verlauf der abgespielten Streams + Den Verlauf der wiedergegebenen Streams und die Wiedergabepositionen löschen Den ganzen Wiedergabeverlauf löschen\? - Wiedergabeverlauf gelöscht. + Wiedergabeverlauf gelöscht. Suchverlauf löschen - Löscht den Verlauf der Suchbegriffe + Den Verlauf der Suchbegriffe löschen Den gesamten Suchverlauf löschen\? Suchverlauf gelöscht. 1 Element gelöscht. NewPipe ist freie Copyleft-Software: Du kannst sie nach Belieben benutzen, untersuchen, mit anderen teilen und verbessern. Insbesondere kannst du sie unter den von der Free Software Foundation veröffentlichten Bedingungen der GNU General Public License, in der Version 3 der Lizenz oder (nach deiner Wahl) jeder späteren Version, weitergeben und/oder verändern. - Möchtest du auch Einstellungen importieren? + Möchtest Du auch Einstellungen importieren\? NewPipe-Datenschutzbestimmungen Dem NewPipe-Projekt ist Datenschutz sehr wichtig. Deshalb sammelt diese App keine Daten ohne deine Zustimmung. \nNewPipes Datenschutzbestimmungen erklären im Detail, welche Daten beim Absenden eines Absturzberichtes verschickt und gespeichert werden. @@ -408,33 +402,33 @@ Wiedergabelisten Titel Benutzer - Deabonnieren + Abbestellen Neuer Tab Tab wählen Gestensteuerung für Lautstärke - Die Lautstärke im Abspieler über Gesten steuern + Die Player-Lautstärke über Gesten steuern Gestensteuerung für Helligkeit - Die Helligkeit im Abspieler über Gesten steuern + Die Player-Helligkeit über Gesten steuern Aktualisierungen Datei gelöscht - Aktualisierungsbenachrichtigung + App Update-Benachrichtigung Benachrichtigung bei neuer NewPipe-Version Kein externer Speicher verfügbar - Herunterladen auf externe SD-Karte ist noch nicht möglich. Zielverzeichnis zurücksetzen\? + Herunterladen auf externe SD-Karte ist nicht möglich. Downloadverzeichnis zurücksetzen\? Fehler beim Lesen der gespeicherten Tabs – es werden die Voreinstellungen benutzt - Voreinstellungen wiederherstellen - Möchtest du die Voreinstellungen wiederherstellen\? + Standardwerte wiederherstellen + Möchtest Du die Standardwerte wiederherstellen\? Abonnentenzahl nicht verfügbar Welche Tabs auf der Hauptseite angezeigt werden Auswahl - Aktualisierungen + Updates Per Benachrichtigung zur Aktualisierung der App auffordern, wenn eine neue Version verfügbar ist Art der Listenansicht Liste Gitter Auto Ansicht wechseln - NewPipe-Aktualisierung verfügbar! + NewPipe-Update verfügbar! Zum Herunterladen antippen Fertig Ausstehend @@ -453,7 +447,7 @@ Fehler anzeigen Code Die Datei kann nicht erstellt werden - Der Zielordner kann nicht erstellt werden + Das Zielverzeichnis kann nicht erstellt werden System verweigert den Zugriff Sichere Verbindung fehlgeschlagen Der Server konnte nicht gefunden werden @@ -468,9 +462,49 @@ Anhalten Maximale Wiederholungen Maximalanzahl der Versuche, bevor der Download abgebrochen wird - Beim Umschalten auf mobile Daten pausieren - Downloads, die nicht pausiert werden können, werden wiederholt + Unterbrechen bei kostenpflichtigen Netzwerken + Nützlich beim Wechsel zu mobilen Daten, obwohl einige Downloads nicht unterbrochen werden können Konferenzen Ereignisse Verbindungszeitüberschreitung + Kommentare anzeigen + Deaktivieren, um die Anzeige von Kommentaren zu beenden + Autoplay + + Kommentar + Kommentare + + Keine Kommentare + Kommentare konnten nicht geladen werden + Schließen + Wiedergabe fortsetzen + Letzte Wiedergabeposition wiederherstellen + Positionen in Listen + Wiedergabepositionsanzeigen in Listen anzeigen + Daten löschen + Wiedergabeposition gelöscht. + Datei verschoben oder gelöscht + Eine heruntergeladene Datei mit diesem Namen existiert bereits + kann die Datei nicht überschreiben + Es gibt einen ausstehenden Download mit diesem Namen + NewPipe wurde während der Verarbeitung der Datei geschlossen + Kein Speicherplatz mehr auf dem Gerät + Vorgang abgebrochen, da die Datei gelöscht wurde + Bist Du sicher\? + Downloadwarteschlange begrenzen + Ein Download wird zur gleichen Zeit ausgeführt + Downloads starten + Downloads anhalten + Frage, wohin heruntergeladen werden soll + Du wirst gefragt, wohin Du jeden Download speichern willst + Du wirst gefragt, wohin Du jeden Download speichern willst. +\nAktiviere diese Option, wenn Du auf die externe SD-Karte herunterladen möchtest + SAF verwenden + Das Storage Access Framework erlaubt Downloads auf eine externe SD-Karte. +\nHinweis: Manche Geräte sind nicht kompatibel + Wiedergabepositionen löschen + Alle Wiedergabepositionen löschen + Alle Wiedergabepositionen löschen\? + Ändere die Downloadordner, damit sie wirksam werden + Dienst umschalten, aktuell ausgewählt: \ No newline at end of file diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 3edb971cfaf..4f3499cfd8f 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -5,7 +5,7 @@ Δεν βρέθηκε πρόγραμμα αναπαραγωγής. Θα θέλατε να εγκαταστήσετε το VLC; Εγκατάσταση Ακύρωση - Άνοιγμα στον browser + Άνοιγμα στο πρόγραμμα περιήγησης ιστού Κοινοποίηση Λήψη Αναζήτηση @@ -120,12 +120,12 @@ Αφαίρεση όλων των προσωρινά αποθηκευμένων δεδομένων ιστοσελίδων Η προσωρινή μνήμη μεταδεδομένων εκκαθαρίστηκε Αυτόματη πρόσθεση της επόμενης ροής στην ουρά - Αυτόματη πρόσθεση μιας σχετικής ροής όταν αναπαράγεται η προηγούμενη ροή σε μια μη-επαναλαμβανόμενη ουρά. + Αυτόματη πρόσθεση μιας σχετικής ροής όταν αναπαράγεται η προηγούμενη ροή σε μια μη-επαναλαμβανόμενη ουρά Έλεγχος αναπαραγωγής με χειρονομίες Χρήση χειρονομιών για τον έλεγχο της φωτεινότητας και της έντασης ήχου της εφαρμογής Εμφάνιση υποδείξεων ενώ κάνετε αναζήτηση Αποθήκευση αναζητήσεων στη συσκευή - Ιστορικό & Προσωρινή Αποθήκευση + Προβολή Ιστορικού Κρατήστε ιστορικό των βίντεο που έχετε δει Συνέχεια όταν η εφαρμογή έρθει σε πρώτο πλάνο Συνέχιση της αναπαραγωγής έπειτα από διακοπές (π.χ.: κλήσεις) @@ -175,7 +175,7 @@ Εκκαθάριση ιστορικού προβολής Διαγράφει το ιστορικό των ροών που έχουν αναπαραχθεί Διαγραφή ολόκληρου του ιστορικού προβολής; - Το στορικό προβολής διαγράφηκε. + Το στορικό προβολής διαγράφηκε. Διαγραφή ιστορικού αναζητήσεων Διαγράφει το ιστορικό αναζητήσεών σας Διαγραφή ολόκληρου του ιστορικού αναζητήσεων; @@ -227,8 +227,8 @@ Κανένα βίντεο - Βίντεο - Βίντεο + %s Βίντεο + %s Βίντεο Εκκίνηση Αναπαραγωγή @@ -247,7 +247,7 @@ Λήψη NewPipe Παρακαλώ περιμένετε… Αντιγράφηκε στο πρόχειρο - Παρακαλώ επιλέξτε έναν διαθέσιμο φάκελο λήψεων + Παρακαλώ ορίστε έναν διαθέσιμο φάκελο λήψεων αργότερα στις ρυθμίσεις Αυτή η άδεια είναι απαραίτητη για \nτο άνοιγμα αναδυόμενων παραθύρων 1 αντικείμενο διαγράφηκε. @@ -266,7 +266,7 @@ Δεν ήταν δυνατή η φόρτωση της άδειας Περί Συνεισφέροντες - Ανοιχτού κώδικα, ελαφριά εφαρμογή του Android, για την αναπαραγωγή πολυμεσων από το ίντερνετ. + Ανοιχτού κώδικα, ελαφριά εφαρμογή Android, για την αναπαραγωγή πολυμέσων από το διαδίκτυο. Συνεισφέρετε Αν έχετε ιδέες για μετάφραση, αλλαγή σχεδιασμού, εκκαθάριση ή ριζικές αλλαγές κώδικα της εφαρμογής—η βοήθεια σας είναι πάντα ευπρόσδεκτη. Όσο περισσότερη έχουμε, τόσο καλύτεροι γινόμαστε! Δείτε το στο GitHub @@ -314,11 +314,11 @@ Λεπτομέρειες Ρυθμίσεις ήχου Πιέστε παρατεταμένα για να προστεθεί στην ουρά - Προσθήκη στην ουρά όταν είναι στο παρασκήνιο - Προσθήκη στην ουρά νέου Αναδυόμενου παραθύρου + "Προσθήκη στη λίστα αναπαραγωγής του παρασκήνιου" + Προσθήκη στη λίστα αναπαραγωγής νέου Αναδυόμενου παραθύρου Εκκίνηση Αναπαραγωγής εδώ - Εκκίνηση εδώ όταν είναι στο Παρασκήνιο - Εκκίνηση εδώ όταν είναι στο Αναδυόμενο Παράθυρο + Εκκίνηση αναπαραγωγής στο παρασκήνιο + Εκκίνηση αναπαραγωγής στο Αναδυόμενο Παράθυρο Άνοιγμα Συρταριού Κλείσιμο Συρταριού Κάτι θα παιχτεί εδω σύντομα ;D @@ -414,7 +414,7 @@ Ειδοποίηση Ενημέρωσης Εφαρμογής Ειδοποίηση για νεότερη έκδοση του NewPipe Εξωτερική μνήμη αποθήκευσης μη διαθέσιμη - Η αποθήκευση στην εξωτερική μνήμη απέτυχε. Επαναφορά στην αρχική τοποθεσία λήψης; + Η αποθήκευση στην SD κάρτα δεν είναι δυνατή. Επαναφορά στην αρχική τοποθεσία λήψης; Χρήση προεπιλεγμένων καρτέλων, σφάλμα κατα την ανάγνωση των αποθηκευμένων καρτέλων Επαναφορά προεπιλεγμένων ρυθμίσεων Θέλετε να επαναφέρετε τις προεπιλεγμένες ρυθμίσεις; @@ -432,7 +432,7 @@ Νεά Έκδοση NewPipe Διαθέσιμη! Πατήστε για λήψη Ολοκληρώθηκε - Στην ουρά αναμονής + Εκκρεμεί Παύση στην ουρά Μετεπεξεργασία @@ -448,8 +448,8 @@ Υπάρχει μια λήψη σε εξέλιξη με αυτό το όνομα Εμφάνιση σφάλματος Κωδικός - Το αρχείο δεν μπορεί να δημιουργηθεί - Αδυναμία δημιουργίας φάκελου προορισμού + Δεν είναι δυνατή η δημιουργία του φακέλου προορισμού + Δεν είναι δυνατή η δημιουργία του αρχείου Η αδειοδότηση απορρίφθηκε απο το σύστημα Δημιουργία ασφαλής σύνδεσης απέτυχε Αδυναμία εύρεσης του εξυπηρετητή @@ -464,6 +464,45 @@ Διακοπή Μέγιστες επαναπροσπάθειες Μέγιστος αριθμός προσπαθειών προτού γίνει ακύρωση της λήψης - Παύση με την εναλλαγή του δικτύου σε δεδομένα - Οι λήψεις που δεν δέχονται παύση θα επανεκκινηθούν + Διακοπή σε δίκτυα με ογκοχρέωση + Χρήσιμο κατά τη μετάβαση σε δεδομένα κινητής τηλεφωνίας, αν και ορισμένες λήψεις δεν μπορούν να ανασταλούν + Προβολή σχολίων + Απενεργοποίηση για διακοπή της εμφάνιση σχολίων + Αυτόματη αναπαραγωγή + + Σχόλια + + + Χωρίς σχόλια + Δεν ήταν δυνατή η φόρτωση σχολίων + Κλείσιμο + Συνέχιση αναπαραγωγής + Επαναφορά της τελευταίας θέσης αναπαραγωγής + Θέσεις στις λίστες + Εμφάνιση ενδείξεων θέσης αναπαραγωγής στις λίστες + Εκκαθάριση δεδομένων + Οι θέσεις αναπαραγωγής διαγράφηκαν. + Το αρχείο μετακινήθηκε ή διαγράφηκε + δεν είναι δυνατή η αντικατάσταση του αρχείου + Υπάρχει μια εκκρεμή λήψη με αυτό το όνομα + Το NewPipe έκλεισε, ενώ εργάζονται στο αρχείο + Δεν είναι αρκετός ο χώρος στη συσκευή + Η πρόοδος χάθηκε, επειδή το αρχείο διαγράφηκε + Λήξη χρονικού ορίου σύνδεσης + Είστε σίγουρος; + Περιορισμός ουράς λήψης + Μια λήψη θα εκτελεστεί ταυτόχρονα + Έναρξη λήψεων + Παύση λήψεων + "Ερώτηση που να γίνει η λήψη" + Θα ερωτηθείτε πού να αποθηκεύσετε κάθε λήψη + Θα σας ζητηθεί πού να αποθηκεύσετε κάθε λήψη. +\nΕπιλέξτε SAF αν θέλετε να κατεβάσετε σε μια εξωτερική κάρτα SD + Χρήση SAF + Το \"Πλαίσιο Πρόσβασης Αποθήκευσης\" (SAF) επιτρέπει λήψεις σε μια εξωτερική κάρτα SD. +\nΣημείωση: ορισμένες συσκευές δεν είναι συμβατές + Διαγραφή θέσεων αναπαραγωγής + Διαγράφει όλες τις θέσεις αναπαραγωγής + Να διαγραφούν όλες οι θέσεις αναπαραγωγής; + Αλλαγή των φακέλων λήψης για να τεθούν σε ισχύ \ No newline at end of file diff --git a/app/src/main/res/values-eo/strings.xml b/app/src/main/res/values-eo/strings.xml index 6687081301b..42d46cb9534 100644 --- a/app/src/main/res/values-eo/strings.xml +++ b/app/src/main/res/values-eo/strings.xml @@ -1,4 +1,4 @@ - + %1$s vidoj Eldonita je %1$s @@ -15,7 +15,6 @@ turno Uzi eksteran videoludilon Uzi eksteran sonludilon - Defaŭlta distingivo Ludi per Kodi Montri \"Ludi per Kodi\"-opcion @@ -24,7 +23,6 @@ Etoso Malluma Luma - Elŝuti Sekva video Ligilo ne subtenita @@ -37,7 +35,6 @@ Eraro Reteraro Enhavo ne estas disponebla - Ŝatoj Malŝatoj Uzi la programon Tor @@ -55,27 +52,22 @@ Elŝutujo por videoj Elŝutujo por muziko (Eksperimenta) Devigi elŝuttrafikon tra Tor por pli bona privateco (elsendfluaj videoj estas ankoraŭ ne subtenitaj). - Montri opcion por ludi videon per la aplikaĵo Kodi Dosierujo por konservi elŝutitajn videojn Dosierujo por konservi elŝutitan muzikon Elektu lokon por konservi elŝutitajn videojn - Elektu lokon por konservi elŝutitan muzikon - Enhavo Raporti eraron per retpoŝto RAPORTI Informoj: Via komento (en la angla): Detaloj: - - Raporti eraron Video Reprovi -Tapu serĉo por komenci - Neniu elsendlflua ludilo trovita (instalu VLC por ludi ĝin) + Tapu serĉo por komenci + Neniu elsendlflua ludilo trovita (instalu VLC por ludi ĝin). Malfermi en ŝprucfenestron modon Iuj rezolucioj NE havos aŭdion kiam ĉi tiu eblo estas ebligita NewPipe ŝprucfenestron modon @@ -83,20 +75,16 @@ Abonita Kanalo malabonita Neebla ŝanĝi abonon - Elŝutu dosieron. + Elŝutu dosieron Ne eblas ĝisdatigi abonon Montri informon - Ĉefa Abonoj Legosigno - Kio novas - Fono ŝprucfenestron Aldonu al - Aŭtomata play Ludas video kiam NewPipe vokas de alia programo Defaŭlta popup rezolucio @@ -109,4 +97,4 @@ Uzu rapide, ne preciza serĉon Ne preciza serĉo permesas al la ludanto serĉi poziciojn pli rapide kun malalta precizeco Ŝarĝi bildetojn - + diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 3e3e6457196..f6771d26c8b 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -1,6 +1,6 @@ - %1$s de visualizaciones + %1$s vistas Publicado el %1$s No se encontró ningún reproductor de vídeo. ¿Desea instalar VLC? Instalar @@ -15,13 +15,14 @@ Elegir navegador rotación Carpeta de descarga de vídeo - Ruta para almacenar los vídeos descargados - Introducir directorio de descargas para vídeos + Aquí se almacenan los vídeos descargados + Elegir carpeta de descarga para vídeos + Cambie las carpetas de descarga para que tenga efecto Resolución por defecto de vídeo Reproducir con Kodi Aplicación Kore no encontrada. ¿Instalarla? Mostrar opción \"Reproducir con Kodi\" - Mostrar una opción para reproducir vídeo con Kodi Media Center + Mostrar una opción para reproducir vídeo en Kodi Audio Formato de audio por defecto Descargar @@ -40,9 +41,8 @@ (Experimental) Forzar la descarga a través de Tor para una mayor privacidad (transmisión de vídeos aún no compatible). No se puede crear la carpeta de descarga \'%1$s\' Carpeta de descarga creada \'%1$s\' - Ruta para almacenar los audios descargados - Introducir ruta de descarga para archivos de audio - + Los archivos de audio descargados se guardarán aquí + Elegir carpeta de descarga para archivos de audio Carpeta de descarga de audio Vídeo y audio Reproducir @@ -51,17 +51,17 @@ No se pudo cargar las miniaturas No se pudo descifrar la URL del vídeo No se pudo analizar el sitio web - Mostrar vídeos \'siguientes\' y \'similares\' + Mostrar videos \'siguientes\' y \'similares\' Idioma del contenido por defecto Vista previa del vídeo - Vista previa del vídeo + Reproducir vídeo, duración: Me gusta No me gusta Miniatura del avatar del usuario Las transmisiones en vivo aún no están soportadas Contenido Contenido restringido por edad - Mostrar vídeo restringido por edad. Se puede permitir este tipo de material desde Ajustes. + Mostrar vídeo restringido por edad. Permitir este contenido es posible desde Ajustes. Toque en buscar para empezar Reproducción automática Reproducir un vídeo cuando NewPipe es llamado desde otra app @@ -99,11 +99,11 @@ Servidor no soportado El archivo ya existe URL mal formada o Internet no disponible - Descarga de NewPipe + NewPipe está descargando Toque para ver detalles - Espere, por favor … + Por favor espere… Copiado al portapapeles - Por favor, seleccione un directorio de descarga disponible + Por favor, defina un directorio de descarga más tarde en los ajustes No se pudo cargar la imagen La interfaz de la app dejó de funcionar Lo sucedido:\\nPetición:\\nIdioma del contenido:\\nServicio:\\nHora GMT:\\nPaquete:\\nVersión:\\nVersión del SO: @@ -137,7 +137,7 @@ abrir en modo popup Recordar el último tamaño y posición del popup Popup Redimensionando - Elimina el audio en algunas resoluciones + Elimina el audio en ALGUNAS resoluciones Controles de gestos del reproductor Usar gestos para controlar el brillo y volumen del reproductor Sugerencias de búsqueda @@ -156,7 +156,7 @@ abrir en modo popup Streaming gratuito y ligero en Android. Ver en GitHub Licencia de NewPipe - Si tienes ideas de; traducción, cambios de diseño, limpieza de código o cambios de código realmente fuertes—la ayuda siempre es bienvenida. Cuanto más se hace, mejor se pone! + Si tienes ideas de; traducción, cambios de diseño, limpieza de código o grandes cambios de código—la ayuda siempre es bienvenida. Cuanto más se hace, mejor se pone! Leer licencia Contribuir Suscribirse @@ -177,11 +177,11 @@ abrir en modo popup La mayoría de caracteres especiales Historial de búsqueda Almacenar búsquedas localmente - Historial y caché + Historial de vistas Almacenar historial de vídeos vistos Historial Buscado - Visualizado + Visto Historial desactivado Historial El historial está vacío @@ -194,7 +194,7 @@ abrir en modo popup Lista de reproducción Deshacer No hay resultados - Nada más que grillos + Aquí no hay nada más que grillos Sin suscriptores %s suscriptor @@ -207,8 +207,8 @@ abrir en modo popup Sin vídeos - Vídeo - Vídeos + %s vídeo + %s vídeos Elemento eliminado ¿Desea eliminar este elemento del historial de búsqueda? @@ -219,7 +219,7 @@ abrir en modo popup Página de feed Página del canal Seleccione un canal - No hay canales suscritos todavía + No hay suscripciones a canales todavía Seleccione un kiosco Kiosco Tendencias @@ -232,19 +232,19 @@ abrir en modo popup Se produjo un error irrecuperable del reproductor Recuperándose del error del reproductor Reproductor en segundo plano - Reproductor popup + Reproductor emergente Quitar Detalles Ajustes de audio [Desconocido] - Poner en cola de segundo plano - Poner en cola de popup + Añadir a cola en segundo plano + Añadir a cola en un popup nuevo Comenzar a reproducir aquí - Comenzar aquí en segundo plano - Comenzar aquí en popup - Mostrar consejo \"Mantener para poner en la cola\" + Comenzar a reproducir en segundo plano + Comenzar a reproducir en un popup nuevo + Muestra el consejo \"Manten para poner en la cola\" Nuevo y popular - Mantener para poner en la cola + Mantener presionado para agregar a la cola Donar NewPipe es desarrollado por voluntarios que emplean su tiempo para brindarte la mejor experiencia. Devuelve el favor para ayudar a los desarrolladores a crear un NewPipe aún mejor mientras disfrutan de una taza de café. Donar @@ -272,14 +272,14 @@ abrir en modo popup Cargando contenido solicitado Importar base de datos Exportar base de datos - Reemplazará su historial actual y sus suscripciones + Reemplaza tu historial actual y suscripciones Exportar historial, suscripciones y listas de reproducción Exportado Importado Archivo ZIP no válido ADVERTENCIA: no se pudieron importar todos los archivos. Esto reemplazará su configuración actual. - Descargar archivo stream + Descargar archivo de stream Mostrar info "Listas de reproducción en marcadores " Añadir a @@ -321,14 +321,12 @@ abrir en modo popup Usar búsqueda rápida inexacta La búsqueda inexacta permite al reproductor buscar posiciones más rápido con menor precisión Auto-encolar la siguiente transmisión - Auto-añadir un vídeo relacionado al reproducir el último vídeo en una cola no repetitiva. - DIRECTO - SINCRONIZAR + Añadir de forma automática un vídeo relacionado con el último vídeo reproducido en una cola no repetitiva Archivo Archivo movido o eliminado No existe el directorio No existe la fuente del archivo/contenido - El archivo no existe o insuficientes permisos para leerlo o escribir en él + El archivo no existe o carece de los permisos para leer o escribir en él El nombre del archivo no puede estar vacío Ocurrió un error: %1$s Importar/exportar @@ -359,7 +357,7 @@ abrir en modo popup Cargar miniaturas Desactívalo para evitar la carga de miniaturas, ahorrando datos y uso de memoria. Los cambios borrarán tanto la caché de imágenes en la memoria como en el disco. Caché de imagen limpiado - Metadatos eliminados del caché + Eliminar metadatos de la caché Eliminar todos los datos de la página web en caché Metadatos del caché limpiados Controles de velocidad de reproducción @@ -371,17 +369,17 @@ abrir en modo popup Acción por defecto al abrir contenido — %s No hay ninguna app instalada para reproducir este archivo Subtítulos - Modificar la escala de texto de los subtítulos y los estilos de fondo del reproductor. Requiere el reinicio de la app para que surta efecto. + Modificar la escala de texto de los subtítulos y los estilos de fondo. Requiere reiniciar la app para que surta efecto. Borrar historial de reproducciones - Elimina el historial de las transmisiones reproducidas + Elimina el historial de contenido visto y posiciones de reproducción ¿Eliminar todo el historial de reproducciones\? - Historial de reproducciones eliminado. + Historial de reproducciones eliminado. Borrar historial de búsqueda Elimina el historial de palabras clave de búsqueda ¿Eliminar todo el historial de búsqueda\? Historial de búsquedas eliminado. 1 elemento eliminado. - NewPipe es software libre copyleft: puedes usarlo, estudiarlo, compartirlo y mejorarlo a tu antojo. Específicamente, puedes redistribuirlo y/o modificarlo bajo los términos de la Licencia Pública General GNU publicada por la Free Software Foundation, ya sea la versión 3 de la Licencia, o (a tu elección) cualquier versión posterior. + NewPipe es un software copyleft libre: puedes usarlo, estudiarlo, compartirlo y mejorarlo a voluntad. Específicamente, puedes redistribuirlo y/o modificarlo bajo los términos de la Licencia Pública General GNU publicada por la Free Software Foundation, ya sea la versión 3 de la Licencia, o (a tu elección) cualquier versión posterior. ¿Desea importar también los ajustes? Política de Privacidad de NewPipe El proyecto NewPipe toma su privacidad muy en serio. Por lo tanto, la aplicación no recopila ningún dato sin su consentimiento. La política de privacidad de NewPipe explica en detalle qué datos se envían y almacenan cuando envía un informe de fallas. @@ -391,11 +389,11 @@ abrir en modo popup Declinar Sin límite Limitar la resolución cuando se usen datos móviles - Mimimizar al cambiar de aplicación + Minimizar al cambiar de aplicación Acción de cambiar a otra aplicación desde el reproductor principal — %s Ninguna - Minimizar al reproductor de fondo - Minimizar al reproductor popup + Minimizar a reproductor en segundo plano + Minimizar al reproductor flotante Avance rápido durante el silencio Paso Reiniciar @@ -408,7 +406,7 @@ abrir en modo popup pausado en cola post-procesado - Encolar + Añadir a cola Acción denegada por el sistema Archivo borrado @@ -437,8 +435,6 @@ abrir en modo popup Solo se permitirá una descarga a la vez Iniciar descargas Pausar descargas - - Mostrar error Codigo @@ -457,13 +453,13 @@ abrir en modo popup No hay suficiente espacio disponible en el dispositivo Se perdió el progreso porque el archivo fue eliminado Tiempo de espera excedido - - Seleccione los directorios de descarga Preguntar dónde descargar Se preguntará dónde guardar cada descarga - Se preguntará dónde guardar cada descarga.\nHabilita esta opción si quieres descargar en la tarjeta SD externa - - Desuscribirse + Se le preguntará dónde guardar cada descarga. +\nHabilite esta opción junto con SAF si quiere descargar en la tarjeta SD + Usar SAF + El Framework de Acceso al Almacenamiento permite descargar en la tarjeta SD externa.\nNota: Algunos los dispositivos no son compatibles + Cancelar suscripción Nueva pestaña Elige la pestaña Control de volumen por gestos @@ -490,4 +486,24 @@ abrir en modo popup Cambiar vista ¡Actualización de NewPipe disponible! Pulsa para descargar + Mostrar comentarios + Deshabilitar para dejar de mostrar comentarios + Reproducción automática + + Comentarios + + + Sin comentarios + No se pudo cargar comentarios + Cerrar + Continuar reproducción + Restaurar última posición de la reproducción + Posiciones en listas + Mostrar indicador de posición en listas de reproducción + Borrar datos + Posiciones de reproducción borradas. + Borrar posiciones de reproducción + Elimina todas las posiciones de reproducción + ¿Borrar todas las posiciones de reproducción\? + Activar/desactivar servicio, seleccionados actualmente: \ No newline at end of file diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml index 1a1f6e145a1..baad94b5dcf 100644 --- a/app/src/main/res/values-et/strings.xml +++ b/app/src/main/res/values-et/strings.xml @@ -137,7 +137,7 @@ Puhasta vaatamiste ajalugu Kustutab vaadatud voogude ajaloo Kas kustutada kogu vaatamiste ajalugu\? - Vaatamiste ajalugu kustutati. + Vaatamiste ajalugu kustutati. Kustuta otsinguajalugu Kustutab otsisõnade ajaloo Kas kustutada kogu otsinguajalugu\? diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index 7ca13303bf1..7da39393e15 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -136,7 +136,7 @@ Ukitu xehetasunetarako Itxaron mesedez… Arbelera kopiatuta - Aukeratu eskuragarri dagoen karpeta bat deskargetarako + Ezarri deskargetarako karpeta bat ezarpenetan geroago Baimen hau beharrezkoa da \nlaster-leiho moduan irekitzeko reCAPTCHA @@ -176,7 +176,7 @@ Karaktere berezi gehienak Bilaketa historiala Gorde bilaketak lokalki - Historiala eta katxea + Ikustaldien historiala Gorde ikusitako bideoen historiala NewPipe jakinarazpena Erreproduzigailua @@ -199,8 +199,8 @@ Bideorik ez - Bideoa - Bideoak + %s Bideoa + %s Bideoak Historiala Bilatuta @@ -253,8 +253,8 @@ Jarri ilaran bigarren planoan Jarri ilaran laster-leihoan Hasi hemen erreproduzitzen - Hasi hemen bigarren planoan - Hasi hemen laster-leihoan + Hasi erreproduzitzen bigarren planoan + Hasi erreproduzitzen laster-leihoan "Ireki tiradera " Itxi tiradera Ez da jarioen erreproduzigailurik aurkitu (VLC instalatu dezakezu). @@ -280,7 +280,7 @@ Kendu cachetik webguneen datu guztiak Metadatuen cachea ezabatuta Gehitu ilarara hurrengo jarioa - Gehitu erlazionatutako jario bat azken jarioa jo bitartean errepikapenik gabeko ilara batean. + Gehitu erlazionatutako jario bat azken jarioa jo bitartean errepikapenik gabeko ilara batean Arazketa Fitxategia Inportatu datu-basea @@ -290,7 +290,7 @@ Garbitu ikusitakoaren historiala Jotako jarioen historiala ezabatzen du Ezabatu ikusitakoaren historia osoa\? - Ikusitakoaren historiala ezabatuta. + Ikusitakoaren historiala ezabatuta. Garbitu bilaketa historiala Ezabatu bilaketa gakoen historiala Ezabatu bilaketen historia osoa\? @@ -374,7 +374,6 @@ Tempoa Tonua Deslotu (distortsioa sor lezake) - Nightcore Lehenetsia Ezarpenak ere inportatu nahi dituzu? Bilaketa ez zehatzak posizioak azkarrago baina prezisio gutxiagoz bilatzea ahalbidetzen du @@ -416,7 +415,7 @@ Aplikazioaren eguneraketaren jakinarazpena NewPipe aplikazioaren bertsio berrien jakinarazpena Kanpo biltegiratzea ez dago eskuragarri - Oraindik ezin da SD txartel batera deskargatu. Deskargen karpeta berrezarri\? + Ezin da SD txartel batera deskargatu. Deskargen karpeta berrezarri nahi duzu\? Lehenetsitako fitxak erabiltzen, errorea gordetako fitxak irakurtzean Berrezarri lehenetsitakoak Lehenetsitakoak berrezarri nahi dituzu\? @@ -465,7 +464,39 @@ Gelditu Gehienezko saiakerak Deskarga ezeztatu aurretik saiatu beharreko aldi kopurua - Pausatu datu mugikorretara aldatzean - Pausatu ezin daitezkeen deskargak berrekingo dira + Eten sare neurtuetan + Erabilgarria datu mugikorretara aldatzean, hala ere deskarga batzuk ezin dira pausatu Konexioaren denbora muga + Erakutsi iruzkinak + Desgaitu iruzkinak erakusteari erakusteko + Erreprodukzio automatikoa + + Iruzkinak + + + Iruzkinik ez + Ezin izan dira iruzkinak kargatu + Itxi + Berrekin erreprodukzioa + Berrezarri azken erreprodukzio-posizioa + Posizioak zerrendetan + Erakutsi erreprodukzio-posizioen adierazleak zerrendetan + Garbitu datuak + Erreprodukzio-posizioak ezabatuta. + Fitxategia lekuz aldatu edo ezabatu da + Badago izen bereko fitxategi bat + ezin da fitxategia gainidatzi + Badago izen bereko deskarga bat burutzeke + NewPipe itxi egin da fitxategian lanean zegoela + Ez dago lekurik gailuan + Progresioa galdu da, fitxategia ezabatu delako + Ziur al zaude\? + Mugatu deskargen ilara + Deskarga bakarra aldi berean + Hasi deskargak + Pausatu deskargak + Galdetu non deskargatu + Non gorde galdetuko zaizu deskarga bakoitzean + Non gorde galdetuko zaizu deskarga bakoitzean. +\nGaitu aukera hau kanpo SD txartelean gorde nahi baduzu \ No newline at end of file diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index d4fcd81fcab..55fa53c614d 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -1,7 +1,7 @@ برای شروع، جست‌وجو را بزنید - ‫%1$s مشاهده + ‫%1$s مشاهده ها منتشر شده در %1$s هیچ پخش‌کنندهٔ جریانی پیدا نشد. مایلید وی‌ال‌سی نصب شود؟ نصب @@ -17,12 +17,12 @@ چرخش استفاده از پخش‌کنندهٔ ویدیوی خارجی استفاده از پخش‌کنندهٔ صدای خارجی - مسیر بارگیری ویدیو - مسیر ذخیرهٔ ویدیوهای بارگیری شده - مسیر بارگیری را برای ویدیوها وارد کنید + پوشه بارگیری ویدیو + ویدیوهای بارگیری شده اینجا ذخیره می‌شوند + پوشه بارگیری ویدیوها را انتخاب کنید پوشه بارگیری صدا - صدای بارگیری شده در این‌جا نگه داشته می‌شود - مسیر بارگیری را برای صداها وارد کنید + صداهای بارگیری شده در این‌جا ذخیره می‌شوند + پوشه بارگیری صداها را انتخاب کنید پخش خودکار هنگامی که نیوپایپ از کارهٔ دیگری فراخوانی می‌شود، ویدیوی به طور خودکار پخش شود وضوح پیش‌گزیده @@ -38,7 +38,7 @@ بارگیری بعدی نماش ویدیوهای «بعدی» و «مشابه» - نشانی اینترنتی پشتیبانی نمی‌شود + نشانی پشتیبانی نشده زبان محتوای ترجیحی ویدیو و صدا ظاهر @@ -47,7 +47,7 @@ پخش محتوا محتوای محدود شده بر اساس سن - نمایش ویدیوهای محدود شده بر اساس سن. اجازه دادن به چنین محتوای از بخش «تنظیمات» ممکن است. + نمایش ویدیوهای دارای محدودیت سنی. اجازه دادن به چنین محتوای از بخش تنظیمات ممکن است. زنده بارگیری‌ها بارگیری‌ها @@ -55,16 +55,16 @@ خطا خطای شبکه نمی‌توان تمام بندانگشتی‌ها را بار کرد - نمی‌توان امضای نشانی اینترنتی ویدیو را رمزگشایی کرد. - نمی‌توان پایگاه وب را تجزیه کرد. - نمی‌توان پایگاه وب را به صورت کامل تجزیه کرد. - محتوا در دسترس نیست. - نمی‌توان فهرست بارگیری را برپا ساخت. - این یک جریان زنده است. این جریان‌ها هنوز پشتیبانی نمی‌شوند. - نمی‌توان هیچ جریانی را گرفت. - ببخشید. نباید این اتّفاق می‌افتاد. - گزارش خطا با نامه - ببخشید. چند مشکل رخ داد. + نمی‌توان امضای نشانی اینترنتی ویدیو را رمزگشایی کرد + نمی‌توان پایگاه وب را تجزیه کرد + نمی‌توان پایگاه وب را به صورت کامل تجزیه کرد + محتوا در دسترس نیست + نمی‌توان فهرست بارگیری را برپا ساخت + جریان‌های زنده هنوز پشتیبانی نمی‌شوند + نمی‌توان هیچ جریانی را گرفت + ببخشید! نباید این اتّفاق زخ می‌داد. + گزارش خطا با رایانامه + ببخشید، چند مشکل رخ داد. گزارش اطّلاعات: چه روی داد: @@ -72,7 +72,7 @@ جزییات: بندانگشتی پیش‌نمایش ویدیو بندانگشتی پیش‌نمایش ویدیو - بندانگشتی کاربر بارگذار + بندانگشتی کاربر بارگذاری کننده پسندها نپسندیدن‌ها استفاده از تور @@ -84,10 +84,10 @@ ویدیو صدا تلاش دوباره - اجازهٔ دسترسی به انبار ذخیره رد شد + اجازهٔ دسترسی به فضای ذخیره رد شد شروع مکث - نمایش + پخش حذف مجموع مقابله‌ای مآموریت جدید @@ -101,8 +101,8 @@ نیوپایپ در حال بارگیری است برای جزییات، ضربه بزنید لطفاً صبر کنید… - در حافظه رونوشت شد. - لطفاً یک شاخهٔ بارگیری موجود را برگزینید. + در حافظه رونوشت شد + پوشه بارگیری را بعدا در تنظیمات مشخص کنید هیچ پخش کننده جریانی پیدا نشد (شما می‌توانید برنامه وی‌ال‌سی را برای پخش آن نصب کنید). بارگیری پرونده جریان حذف صدا در برخی کیفیت‌ها @@ -170,7 +170,7 @@ هیچ بهترین وضوح تمام تاریخچه نمایش پاک شود؟ - تاریخچه نمایش پاک شد. + تاریخچه نمایش پاک شد. پاک‌کردن تاریخچه جستجو تاریخچه کلیدواژه‌های جستجو را پاک می‌کند تمام تاریخچه جستجو پاک شود؟ @@ -200,8 +200,8 @@ بدون ویدئو - ویدئو - ویدئو + %s ویدئو + %s ویدئو ایجاد پاک کردن یک مورد @@ -283,7 +283,7 @@ لغو اشتراک زبان جدید انتخاب زبانه - تاریخچه و حافظه نهان + تاریخچه تماشا تاریخچه و حافظه نهان اشکال‌زدایی به‌روزرسانی‌ها @@ -295,4 +295,205 @@ به یاد داشتن آخرین اندازه و موقعیت قبلی پنجره جداگانه زمان فعلی پخش کننده را به صورت تقریبی و سریع جلو ببر این گزینه باعث می شود هنگام جلو/عقب کردن زمان تصویر، به جای زمان دقیق انتخاب شده، به زمان غیر دقیق و نزدیک به مکان انتخاب شده برود که این کار سریع تر انجام می شود + کاره یا رابط کاربری با خطا مواجه شد + ریکپچا + بارگیری + تغییر جهت + تغییر وضعیت به پس‌زمینه + تغییر وضعیت به اصلی + خدمت + برای تغییر ترتیب، بکشید + حافظه نهان تصویر پاک شد + می‌خواهید تنظیمات را نیز وارد کنید؟ + گام + پرونده پاک شد + اعلان به‌روزرسانی کاره + اعلان‌ها برای نسخه جدید نیوپایپ + بازنشانی پیش‌فرض‌ها + می‌خواهید پیش‌فرض‌ها را بازنشانی کنید؟ + گلچین + به‌روزرسانی‌ها + حالت نمایش سیاهه + سیاهه + شبکه + خودکار + تغییر نمایش + به‌روزرسانی برای نیوپایپ موجود است! + برای بارگیری، لمس کنید + تمام + در انتظار + صف + بارگیری ناموفق بود + بارگیری پایان یافت + یافت نشد + شکست در پساپردازش + بیشینه تعداد تلاش‌ها پیش از لغو بارگیری + رویدادها + نمایش نظرات + غیرفعال کنید تا نمایش نظرات متوقف شود + پخش خودکار + + نظرات + + + بدون نظر + ناتوانی در دریافت نظرات + ادامه پخش به محض فعال شدن + ذخیره محلی نتایج جستجو + زمانی که صف پخش در حال پخش تکراری نیست، حین پخش آخرین جریان، یک جریان مرتبط به طور خودکار اضافه شود + برای جلوگیری از بارگیری تصاویر بندانگشتی و ذخیره فضای ذخیره‌سازی و مصرف داده، خاموش کنید. تغییرات باعث پاک شدن حافظه نهان تصاویر روی حافظه می‌شود. + ادامه پخش + بازگرداندن آخرین موقعیت پخش + موقعیت در فهرست‌ها + نمایش شاخص موقعیت پخش در فهرست‌ها + پاک کردن داده‌ها + برای اثرگذاری، پوشه بارگیری را تغییر دهید + ادامه پخش بعد از قطع ناگهانی (مثل برقراری تماس) + نمایش نکته «برای افزودن، نگه‌دارید» + نمایش نکته‌ها زمانی که در صفحه جزئیات ویدئو، دکمه تصویر در تصویر یا پخش در پس‌زمینه فشرده شود + برای در صف قرار دادن، نگه دارید + کنترل های اشاره ای پخش کننده + از اشارات برای کنترل روشنایی و صدای پخش کننده استفاده کنید + کنترل اشاره ای صدا + "برای کنترلصدای پخش کننده از اشارات استفاده کنید" + کنترل روشنایی اشاره ای + از اشارات برای کنترل روشنایی صفحه استفاده کنید + بازگردانی + در صف پخش کننده پس‌زمینه قرار گرفت + چه:\\nدرخواست:\\nزبان درخواست:\\nخدمت:\\nزمان GMT:\\nنگارش:\\nنگارش س.ع:\\nبازه آی‌پی: + چالش ری‌کپچا + نیاز به چالش ری‌کپچا است + این مجوز مورد نیاز است +\nتا بتوان به حالت تصویر در تصویر رفت + نمایش به صورت تصویر در تصویر + تصویر در تصویر + پروانه‌های شخص سوم + © %1$s توسط %2$s تحت %3$s + اگر ایده‌ای برای ترجمه، تغییر طراحی، پاک‌سازی کد و یا تغییرات واقعا سنگین کدنویسی دارید، از کمک‌تان همواره استقبال می‌کنیم. هر چه بیشتر کار کنیم، نتایج بهتری می‌گیریم! + اعلان برای پخش‌کننده تصویر در تصویر و پس‌زمینه نیوپایپ + چیزی جز کریکت اینجا نیست + فاقد مشترک + قرار دادن در صف پخش به صورت تصویر در تصویر + خطای عدم احیای پخش‌کننده رخ داد + در حال احیا از خطای پخش‌کننده + پخش‌کننده تصویر در تصویر + در صف پخش پس‌زمینه قرار بده + در صف پخش تصویر در تصویر قرار بده + شروع پخش در اینجا + شروع پخش در پس‌زمینه + شروع پخش در حالت تصویر در تصویر + نیوپایپ توسط داوطلبانی توسعه داده می‌شود که با صرف زمان، بهترین تجربه را برای شما به ارمغان می‌آورند. حمایت از توسعه‌دهندگان، به آنها کمک می‌کند تا حین نوشیدن یک فنجان قهوه، نیوپایپ را به مراتب بهتر کنند. + حمایت + برای اطلاعات و اخبار بیشتر، به وب‌سایت نیوپایپ سر بزنید. + تغییر وضعیت به تصویر در تصویر + باز کردن کشو + بستن کشو + پخش‌کننده خارجی، این نوع پیونده‌ها را پشتیبانی نمی‌کند + پخش‌کننده تصویر در تصویر + صادر شد + وارد شد + پرونده zip معتبر نیست + هشدار: ناتوانی در وارد کردن همه پرونده‌ها. + این اقدام، همه تنظمات شما را بازنویسی می‌کند. + نشان‌گذاری سیاههٔ پخش + حذف نشان + اندازه‌کردن + پر کردن + بزرگ‌نمایی + به زودی چیزی در اینجا نمایان خواهد شد :) + تولیدشدهٔ خودکار + پرونده موجود نیست و یا مجوز خواندن یا نوشتن روی آن وجود ندارد + وارد کردن پرونده + صادرکردن قبلی + وارد کردن اشتراک‌های یوتیوب با بارگیری پرونده صادرشده: +\n +\n۱. به این نشانی بروید: %1$s +\n۲. در صورت نیاز، وارد شوید +\n۳. بارگیری باید شروع شده شود (این، همان پرونده صادر شده است) + وارد کردن نمایه ساندکلاد با وارد کردن نشانی یا ID شما: +\n +\n۱. حالت میزکار را در مرورگر وب فعال کنید (سایت برای دستگاه‌های همراه در دسترس نیست) +\n۲. به این نشانی بروید: %1$s +\n۳. در صورت لزوم، وارد شوید +\n۴. نشانی نمایه‌ای که به آن هدایت شده‌اید را کپی کنید. + در نظر داشته باشید که این عملیات می‌تواند داده زیادی مصرف کند. +\n +\nادامه می‌دهید؟ + پاک کردن فرادادهٔ کش شده + فراداده‌های کش شده پاکش شدند + تندا + زیر و بمی + قطع پیوند (ممکن است باعث اعوجاج شود) + تریجیح کنش «باز کردن» + کنش پیش‌فرض در زمان باز کردن محتوا — %s + سبک پس‌زمینه و اندازه متن توضیحات پخش‌کننده را تغییر بده. برای تاثیرگذاری، نیازمند بازراه‌اندازی برنامه است. + پاک کردن تاریخچه جریان‌های پخش شه و موقعیت‌های پخش + نیوپایپ، یک نرم‌افزار آزاد کپی‌لِفت است: شما می‌توانید از آن استفاده، آن را بررسی کرده و به دیگران بدهید و اگر مایل باشید، بهترش کنید. به طور خاص، شما می‌توانید آن را تحت پروانه عمومی همگانی گنو نسخه ۳ و یا در صورت تمایل بالاتر، که توسط بنیاد نرم‌افزار آزاد منتشر شده تغییر داده و بازنشر دهید. + حریم شخصی شما برای پروژه نیویایپ بسیاری جدی است. در نتیجه، این برنامه هیچ اطلاعاتی را بدون رضایت شما گردآوری نمی‌کند. +\nسیاست‌های حریم شخصی نیوپایپ با جزئیات توضیح می‌دهد که وقتی گزارش یک خطا را می‌فرستید، چه داده‌هایی ذخیره و فرستاده می‌شود. + به منظور هماهنگی با مقررات حفاظت داده عمومی اروپا (GDPR) در اینجا توجه شما را به سیاست حریم شخصی نیوپایپ جلب می‌کنیم. لطفا آن را به دقت مطالعه کنید. +\nبرای فرستادن گزارش مشکل، باید این سیاست را بپذیرید. + کیفیت را در زمان استفاده از داده همراه محدود کن + پرش به جلو حین سکوت + بازنشانی + فضای ذخیره‌سازی خارجی در دسترس نیست + بارگیری روی کارت SD خارجی ممکن نیست. مایلید محل پوشه بارگیری را دوباره تعیین کنید؟ + استفاده از برگه‌های پیش‌فرض، خطا حین خواندن برگه‌های ذخیره شده + تعداد مشترک‌شدگان دردسترس نیست + چه برگه‌هایی در صفحه اصلی نمایش پیدا کنند + زمانی که نسخه جدید برنامه دردسرس است، اعلانی برای به‌روزرسانی نمایش بده + متوقف + در صف + در حال پساپردازش + این کنش توسط سیستم متوقف شد + %s بارگیری پایان یافت + تولید نام یگانه + بازنویسی + یک بارگیری دیگر با همین نام در جریان است + نمایش خطا + کد + پوشه مقصد نمی‌تواند ساخته شود + پرونده نمی‌تواند ساخته شود + مجوز از سوی سیستم رد شد + شکست در برقرار ارتباط امن + ناتوانی در پیدا کردن کارساز + ناتوانی در اتصال به کارساز + کارساز داده‌ای نمی‌فرستد + کارساز، بارگیری‌های چندرشته‌ای را قبول نمی‌کند، تلاش مجدد با ‎@string/msg_threads = 1 + بازهٔ درخواست شده قابل قبول نیست + پاک کردن بارگیری‌های تمام شده + توقف + بیشینه تلاش مجدد + این ویژگی زمانی که ارتباط را به داده همراه تغییر می‌دهید مفید است هرچند برخی بارگیری‌ها نمی‌توانند تعلیق شوند + کنفرانس‌ها + بستن + موقعیت‌های پخش حذف شدند. + پزونده حذف یا جابجا شده است + پرونده‌ای با همین نام وجود دارد + یک پرونده بارگیری شده با همین نام وجود دارد + ناتوانی در بازنویسی پرونده + یک بارگیری دیگر با همین نام در صف قرار دارد + نیوپایپ در خلال کار روی پرونده، بسته شد + فضایی روی دستگاه باقی نمانده است + پیشرفت کار متوفق شد زیرا پرونده پاک شده است + پایان زمان اتصال + مطمئنید؟ + محدود کردن صف بارگیری + یک بارگیری در هر زمان اجرا شود + شروع بارگیری‌ها + مکث بارگیری‌ها + محل بارگیری را سوال کن + برای هر بارگیری از شما پرسیده خواهد شد که کجا ذخیره شود + از شما پرسیده خواهد شد که هر بارگیری کجا ذخیره شود. +\nاگر می‌خواهید بارگیری در کارت SD خارجی ذخیره شود، گزینه SAF را انتخاب کنید + استفاده از SAF + چارچوب دسترسی حافظه اجازه دخیره بارگیری‌ها در کارت SD خارجی را می‌دهد. +\nنکته: برخی دستگاه‌ها با این قابلیت سازگاری ندارند + حذف موقعیت‌های پخش + حذف تمام موقعیت‌های پخش + همه موقعیت‌های پخش حذف شوند؟ + نظارت بر نشت حافظه ممکن است باعث عدم پاسخگویی نرم افزار در زمان اندوختن حافظه \"هیپ\" شود. + گزارش کردن خطاهای \"خارج از چرخه حیات\" + حذف حافظه کش شده همه صفحات وب + کوچک کردن پخش کننده به پس زمینه \ No newline at end of file diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index 71bf922d1d8..6749a90f257 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -1,5 +1,6 @@ - -Napauta hakua aloittaaksesi + + + Napauta hakua aloittaaksesi %1$s näyttökertaa Julkaistu %1$s Ei löytynyt soitinta. Haluatko asentaa VLC:n? @@ -24,23 +25,17 @@ Kanavan tilaus peruttu Ei pystytty vaihtamaan tilausta Ei pystytty päivittämään tilausta - Päävalikko Tilaukset - Uudet - Taustatoisto Ikkuna - Videolatausten sijainti Sijainti ladatuille videoille Aseta sijainti minne videot tallennetaan - Äänilatausten sijainti Sijainti ladatuille äänitiedostoille Aseta sijainti minne äänitiedostot tallennetaan - Automaattitoisto Toistaa automaattisesti videon, kun NewPipe avataan toisesta ohjelmasta Oletusresoluutio @@ -103,10 +98,8 @@ Muutetaan kokoa Paras resoluutio Peru - NewPipe Ilmoitus Ilmoitukset Newpipe taustasoitolle ja ponnahdusikkunalle - Virhe Verkkovirhe Ei pystytty lataamaan kaikkia esikatselukuvia @@ -126,8 +119,6 @@ Mitä tapahtui: Sinun viesti (englanniksi): Yksityiskohdat: - - Videon esikatselukuva Videon esikatselukuva Jakajan avatar esikatselukuva @@ -139,46 +130,37 @@ Käyttäjäraportti Ei tuloksia Tyhjää täynnä - Ei voida luoda lataushakemistoa \'%1$s\' Luotiin lataushakemisto \'%1$s\' - Video Ääni Toista uudelleen Oikeus tallennustilan hallintaan evätty - t. milj. bilj. - Ei tilaajia - %s tilaaja - %s tilaajaa - - + %s tilaaja + %s tilaajaa + Ei katselukertoja - %s katselukerta - %s katselukertaa - - + %s katselukerta + %s katselukertaa + Ei videoita - %s video - %s videoita - - + %s video + %s videoita + Aloita Keskeytä Toista Poista Tarkistus-suma - Uusi tehtävä OK - Tiedostonimi Säikeet Virhe @@ -191,19 +173,15 @@ Kopioitu leikepöydälle Valitse saatavilla oleva latauskansio Tämä käyttöoikeus tarvitaan ponnahdusikkunan käytölle - reCAPTCHA reCAPTCHA Haaste reCAPTCHA Haaste pyydetty - Lataus Sallitut merkit tiedostonimissä Epäkelvot merkit korvataan tällä arvolla Korvaava merkki - Kirjaimia ja numeroita Suurin osa erikoismerkeistä - Tietoja NewPipe Asetukset Tietoja @@ -219,7 +197,6 @@ Olkoon sinulla ideoita; käännöksistä, design muutoksista, koodin siivoamisesta tai raskaista koodimuutoksista—apu on aina tervetullutta. Mitä enemmän saadaan tehtyä, sen paremmaksi sovellus tulee! Lue lisenssi Osallistu - Historia Haettu Katsottu @@ -229,7 +206,7 @@ Historia pyyhitty Poistettu Haluatko poistaa tämän hakuhistoriasta? -Jatka toistoa ohjelman palatessa päällimmäiseksi + Jatka toistoa ohjelman palatessa päällimmäiseksi Info: Mikä:\\nPyyntö:\\nSisällön kieli:\\nPalvelu:\\nGMT Aika:\\nPaketti:\\nVersio:\\nOS versio: © %1$s %2$s %3$s alla @@ -242,47 +219,40 @@ Valitse kanava Ei yhtään tilattua kanavaa vielä Valitse kioski - Kioski Nousussa Top 50 Uudet & kuumat -Näytä vihje kun taustasoitto tai popup painiketta painetaan pohjassa + Näytä vihje kun taustasoitto tai popup painiketta painetaan pohjassa Lisätty taustasoittojonoon Lisätty ikkunajonoon Toista kaikki - Tätä ei voitu toistaa Palautuskelvoton soittimen virhe Palaudutaan soittimen virheestä - Taustatoisto Ikkuna Poista Yksityiskohdat Ääniasetukset Pidä pohjassa lisätäksesi jonoon -"Näytä vihje soittolistaan lisäämiseen " + "Näytä vihje soittolistaan lisäämiseen " [Tuntematon] - Lisää taustatoistojonoon Lisää ikkunajonoon Aloita toistaminen Aloita toisto taustalla Aloita toisto ikkunassa -Lahjoita + Lahjoita NewPipe kehitetään vapaaehtoisten toimesta, jotka käyttävät vapaa-aikaansa tuottaakseen parhaan mahdollisen käyttökokemuksen sinulle. Nyt on aika antaa takaisin, jotta kehittäjät voivat tehdä NewPipe:sta vielä paremman nauttiessaan kupin kahvia. Anna takaisin Websivu Käy verkkosivuillamme saadaksesi lisää tietoa ja uusimmat uutiset NewPipe:stä. - Soitinta ei löytynyt (voit asentaa VLC:n toistaaksesi) - Lataa toistotiedosto. + Soitinta ei löytynyt (voit asentaa VLC:n toistaaksesi). + Lataa toistotiedosto Näytä lisätietoja - Kirjanmerkit - Lisää soittolistaan - Käytä nopeampaa epätarkkaa pikakelausta Epätarkka kelaus mahdollistaa videon kelauksen nopeammin, huonommalla tarkkuudella Näytä videoiden pikkukuvat @@ -302,12 +272,10 @@ Aina Vain kerran Tiedosto - Vaihda orientaatio Vaihda taustalle Vaihda ponnahdusikkunatoistoon Vaihda normaalitoistoon - Tuo tietokanta Vie tietokanta Kirjoittaa yli tämänhetkisen historian ja tilaukset @@ -315,7 +283,7 @@ Poista katseluhistoria Poistaa toistohistorian Poista koko katseluhistoria. - Katseluhistoria onnistuneesti poistettu. + Katseluhistoria onnistuneesti poistettu. Poista hakuhistoria Poistaa historian haetuista videoista Poista koko hakuhistoria. @@ -330,99 +298,74 @@ Tiedostonimi ei voi olla tyhjä Hups! Tapahtui virhe: %1$s Vedä järjestelläksesi - Luo Poista yksi Poista kaikki Hylkää Nimeä uudelleen - 1 poistettu. - Ohjelmaa tämän toistamiseen ei ole asennettu - NewPipen tietosuojakäytäntö NewPipe ottaa yksityisyytesi tosissaan. Siksi se ei kerää sinulta mitään tietoja ilman lupaasi. NewPipen tietosuojakäytännössä selitetään tarkasti mitä tietoja lähetetään tai tallennetaan virheraportin yhteydessä. Lue tietosuojakäytäntö Automaattisesti lisää ehdotettu video soittolistaan Videostriimejä ei löytynyt ladattavaksi - NewPipe on vapaata softaa. Voit käyttää sitä, katsella sekä muokata sen koodia ja parannella sitä ilmaiseksi mielesi mukaan. Tarkemmin sanottuna, voit jakaa sitä edelleen ja/tai muokata sitä Free Software Foundationin julkaiseman GNU GPL:n, joko versio kolmosen (GPLv3), tai uudemman, ehdoilla. Haluatko poistaa tämän katseluhistoriasta? Oletko varma että haluat poistaa kaiken katseluhistoriasta? Viimeksi toistettu Eniten toistetut - Vienti valmis Tuonti valmis Virheellinen ZIP-tiedosto Varoitus: Ei voitu tuoda kaikkia tiedostoja. Tämä nollaa nykyiset asetuksesi. Haluatko myös tuoda asetukset? - Avaa alasvetovalikko Sulje alasvetovalikko Tähän tulee jotain jossainvaiheessa ;D - - Ensisijainen avaustapa Oletustoiminto avatessa sisältöä — %s - Videosoitin Taustasoitin Ponnahdusikkunasoitin Kysy aina - Haetaan infoa… Ladataan pyydettyä sisältöä - Luo uusi soittolista Poista soittolista Uudelleennimeä soittolista Nimi Lisää soittolistaan Aseta soittolistan kuvakkeeksi - Tallenna soittolista kirjanmerkkeihin Poista kirjanmerkki - Haluatko poistaa tämän soittolistan? Soittolista luotu Lisätty soittolistaan Soittolistan kuvake muutettu Soittolistaa ei voitu poistaa - Ei tekstityksiä - Sovita Täytä Suurenna - Automaattisesti luotu - Tekstitykset Muokkaa tekstitysten kokoa ja taustaa. Asetusten päivittämiseksi sinun tulee käynnistää ohjelma uudelleen - Laita päälle LeakCanary-muistivuodonpaljastin (virheenkorjausta varten) Muistivuotojen valvonta voi aiheuttaa ohjelman hidastumisen virhetilanteissa - Raportoi yhteensopimattomuusvirheitä jotka aiheutuvat vanhoista ohjelmista Pakota raportointi kuljetuskelvottomille Rx-poikkeuksille jotka ovat muistisirpaleiden tai aktiviteettielämänkaaren ulkopuolella poiston jälkeen - Tuo/Vie Tuo Tuo kohteesta Vie kohteeseen - Tuodaan… Viedään… - Tuo tiedosto Edellinen vienti - Tilauksia ei voitu tuoda Tilauksia ei voitu viedä - Tuo youtube-tilaukset lataamalla ensin tilauslistatiedostosi: \n \n1. Mene osoitteeseen: %1$s @@ -435,10 +378,8 @@ \n3. Kirjaudu sisään kysyttäessä. \n4. Kopioi se nettiosoite johon sinut ohjattiin. sinun käyttäjänimesi, soundcloud.com/<sinun käyttäjänimesi> - Ota huomioon että tämä operaatio voi käyttää paljon dataa. \nHaluatko jatkaa? - Toiston nopeuden säätimet Musiikkitempo Sävelkorkeus @@ -446,11 +387,9 @@ Kelaa eteenpäin hiljaisissa kohdissa Askel Nollaa - Jotta olisimme kelpoisia EU:n uuden yleisen tietosuoja-asetuksen (GDPR) kannalta, meidän pitää muistuttaa sinua lukemaan NewPipen tietosuojakäytäntö. Lue se oikeasti. Sinun pitää myös hyväksyä se jotta voit lähettää virheraportin. Hyväksy Hylkää - Ei rajaa Rajoita resoluutiota kun mobiilidata on käytössä Pienennä vaihtaessa ohjelmaa @@ -458,5 +397,4 @@ Ei koskaan Pienennä taustasoittimeksi Muuta ponnahdusikkunaksi - - + \ No newline at end of file diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml new file mode 100644 index 00000000000..40412ac118b --- /dev/null +++ b/app/src/main/res/values-fil/strings.xml @@ -0,0 +1,42 @@ + + + Pindutin ang \'search\' upang makapagsimula + %1$s tingnan + Nai-publish sa %1$s + Walang nahanap na stream player. Nais mo bang mag-install ng VLC\? + Walang nahanap na stream player (maaari mong mai-install ang VLC upang i-play ito). + I-install + Kanselahin + Buksan sa Browser + Buksan sa Popup Mode + Ibahagi + I-download + Mag-download ng stream file + Paghahanap + Mga Setting + Ibig mong sabihin: %1$s\? + Ibahagi sa + Pumili nang Browser + pag-ikot + Gumamit ng panlabas na video player + Tinatanggal ang audio sa ilang mga resolusyon + Gumamit ng panlabas na audio player + NewPipe popup mode + Mag-subscribe + Naka-subscribe + Huwag mag-subscribe + Hindi naka-subscribe sa channel + Hindi mababago ang subscription + Hindi ma-update ang subscription + Ipakita ang impormasyon + Pangunahing + Mga subscription + Naka-bookmark mga Playlist + Bagong Tab + Pumili nang Tab + Anong Bago + Likuran + Popup + Idagdag sa + Folder ng pag-download ng video + \ No newline at end of file diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 35821bb4aea..8506b65117b 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -2,15 +2,15 @@ Annuler Choisir un navigateur - Résolution par défaut - Vouliez-vous dire : %1$s ? + Définition par défaut + Vouliez-vous dire : %1$s \? Télécharger - Chemin de téléchargement vidéo - Entrez le chemin de téléchargement des vidéos - Chemin de stockage des vidéos téléchargées + Dossier de téléchargement vidéo + Choisissez le dossier de téléchargement des fichiers vidéo + Les fichiers vidéo téléchargés sont stockés ici Installer - Application Kore introuvable. L\'installer ? - Aucun lecteur de flux trouvé. Voulez-vous installer VLC ? + Impossible de trouver Kore. Voulez-vous l’installer \? + Aucun lecteur de flux multimédias trouvé. Voulez-vous installer VLC \? Ouvrir dans le navigateur Lire avec Kodi rotation @@ -18,16 +18,16 @@ Paramètres Partager Partager avec - Afficher une option pour lire la vidéo avec Kodi + Afficher une option pour lire une vidéo avec Kodi Afficher l’option « Lire avec Kodi » - Ajoutée le %1$s + Publiée le %1$s %1$s vues Audio Format audio par défaut Télécharger Suivant - Afficher les vidéos \"Suivantes\" et \"Similaires\" - URL non supportée + Afficher les vidéos « Suivantes » et « Similaires » + URL non pris en charge Vidéo & audio Autre Miniature d’aperçu vidéo @@ -35,115 +35,114 @@ Je n’aime pas J’aime Langue du contenu par défaut - Miniature de l’avatar de l’utilisateur + Miniature de l’avatar du téléchargeur Utiliser un lecteur vidéo externe Utiliser un lecteur audio externe Lecture en arrière-plan Lire Utiliser Tor - (Expérimental) Rediriger le trafic de téléchargement via Tor pour plus de confidentialité (streaming non supporté pour le moment). + (Expérimental) Forcer la redirection du trafic de téléchargement via Tor pour plus de confidentialité (la lecture de flux vidéos n’est pas encore prise en charge). Thème Sombre Clair Apparence Erreur réseau Dossier de téléchargement audio - L\'audio téléchargé est stocké ici - Entrez le chemin de téléchargement des fichiers audio + Les fichiers audio téléchargés sont stockés ici + Choisissez le dossier de téléchargement des fichiers audio Impossible de créer le répertoire de téléchargement « %1$s » Répertoire de téléchargement « %1$s » créé Erreur - Impossible d\'analyser le site web + Impossible d’analyser le site web Contenu non disponible - - Désolé, des erreurs se sont produites. + Désolé, des erreurs sont survenues. Contenu - Contenu avec limite d\'âge + Contenu avec limite d’âge EN DIRECT Impossible de charger toutes les miniatures Impossible de déchiffrer la signature URL de la vidéo - Impossible d\'analyser complètement le site web + Impossible d’analyser complètement le site web Les flux en direct ne sont pas encore pris en charge - Désolé, une erreur s’est produite. + Désolé, une erreur est survenue. Lire la vidéo lorsque NewPipe est appelée par une autre application - Signaler l\'erreur par e-mail + Rapporter l’erreur par courriel Information : - Ce qui s\'est passé : + Ce qui s’est passé : Votre commentaire (en anglais) : Détails : - Signaler une erreur + Rapporter une erreur Vidéo Audio Réessayer - Autorisation d\'accès au stockage refusée - Faites une recherche pour commencer + Autorisation d’accès au stockage refusée + Appuyer sur la loupe pour commencer Lecture automatique - Afficher les vidéos soumises à une limite d\'âge. Autoriser ce type de contenu est possible depuis les paramètres. + Afficher les vidéos soumises à une limite d’âge. Autoriser ce type de contenu est possible depuis les paramètres. Rapport utilisateur - SIGNALER + RAPPORTER Impossible de configurer le menu de téléchargement - Impossible d\'obtenir un flux + Impossible d’obtenir le moindre flux Téléchargements Téléchargements - Rapport d\'erreur - Lire + Rapport d’erreur + Démarrer Pause Lire Supprimer Somme de contrôle - Nouveau + Nouvelle mission OK Nom du fichier - Threads + Fils de discussion Erreur - Serveur non supporté + Serveur non pris en charge Fichier déjà existant - Lien malformé ou internet indisponible - Téléchargement NewPipe + Lien malformé ou accès à internet indisponible + NewPipe télécharge… Appuyer pour plus de détails Veuillez patienter… Copié dans le presse-papiers - Sélectionner un dossier de téléchargement disponible - Impossible de charger l\'image - L’application a crashé + Veuillez définir ultérieurement un dossier de téléchargement dans les paramètres + Impossible de charger l’image + L’application a planté reCAPTCHA Noir Tout Chaîne Défi reCAPTCHA Défi reCAPTCHA demandé - Ouvrir en mode fenêtré - Mode fenêtré NewPipe - Lecture en mode fenêtré + Ouvrir en mode flottant + Mode flottant NewPipe + Lecture en mode flottant Oui Plus tard Désactivé - Quoi :\\nRequête :\\nLangue du contenu :\\nService :\\nHeure GMT :\\nPaquet :\\nVersion :\\nVersion du système : + Quoi :\\nRequête :\\nLangue du contenu :\\nService :\\nHeure UTC :\\nPaquet :\\nVersion :\\nVersion du système d’exploitation : K M - Cette autorisation est nécessaire pour -\nutiliser le mode fenêtré + Cette autorisation est nécessaire pour +\nutiliser le mode flottant Arrière-plan - Fenêtre - Résolution de la fenêtre par défaut - Afficher résolutions plus élevées - Seulement certains appareils supportent la lecture 2K/4K + Flottant + Définition de la fenêtre flottante par défaut + Afficher des définitions plus élevées + Seuls certains appareils prennent en charge les vidéos 2K et 4K Format vidéo par défaut - Mémoriser la taille et la position de la fenêtre - Mémoriser la dernière taille et position de la fenêtre - Fenêtre + Mémoriser les taille et position de la fenêtre flottante + Mémoriser les dernières taille et position de la fenêtre flottante + Fenêtre flottante Filtre - Actualiser + Rafraîchir Effacer Redimensionner B - Supprime l\'audio à CERTAINES résolutions + Retire l’audio à CERTAINES définitions Utiliser les gestes pour contrôler la luminosité et le volume du lecteur Suggestions de recherche - Afficher les suggestions lors d\'une recherche - Gestes pour contrôler la lecture - Meilleure résolution - S\'abonner + Afficher les suggestions lors d’une recherche + Contrôles gestuels de la lecture + Meilleure définition + S’abonner Abonné Désabonné de la chaîne Principal @@ -152,13 +151,13 @@ Téléchargement Paramètres À propos - Licences tierces + Licences tierce partie Impossible de charger la licence - Ouvrir le site + Ouvrir le site web À propos Contributeurs Licences - Lecteur de flux libre et léger pour Android. + Lecteur de flux multimédias libre et léger pour Android. Voir sur GitHub Licence de NewPipe Lire la licence @@ -166,32 +165,32 @@ Lettres et chiffres À propos de NewPipe © %1$s par %2$s sous %3$s - Que ce soit pour des idées, traductions, changements de design, nettoyage ou gros changements de code, l\'aide est toujours la bienvenue. Plus on contribue, meilleur il devient ! - Impossible de modifier l\'abonnement - Impossible d\'actualiser l\'abonnement - Continuer la lecture après les interruptions (ex : appels) - Caractères autorisés dans les noms de fichiers + Que ce soit pour des idées de traductions, de changements de design, de nettoyage de code ou de gros changements de code, une aide est toujours la bienvenue. Plus on contribue, meilleur il devient ! + Impossible de modifier l’abonnement + Impossible d’actualiser l’abonnement + Continuer la lecture après les interruptions (ex : appels téléphoniques) + Caractères autorisés dans les noms de fichier Les caractères invalides sont remplacés par cette valeur Caractère de remplacement Historique de recherche - Conserver les recherches sur l\'appareil - Historique et cache + Stocker l’historique de recheche sur l’appareil + Voir l’historique Historique Recherché - Regardé - L\'historique est désactivé + Vue + L’historique est désactivé Historique - L\'historique est vide + L’historique est vide Historique supprimé Notification NewPipe Annuler - Garder une trace des vidéos regardées - Reprendre sur le gain de focus + Garder un suivi des vidéos vues + Reprendre à l’obtention de la cible de saisie Lecteur Comportement Historique & cache Liste de lecture - Notifications pour les lecteurs \"arrière-plan\" et \"fenêtre\" de NewPipe + Notifications pour les lecteurs en arrière-plan et en mode flottant de NewPipe Aucun résultat Aucun contenu Aucun abonné @@ -206,196 +205,191 @@ Aucune vidéo - Vidéo - Vidéos + %s vidéo + %s vidéos Caractères spéciaux - Élément effacé - Voulez-vous supprimer cet élément de l\'historique de recherche ? + Élément supprimé + Voulez-vous supprimer cet élément de l’historique de recherche \? Contenu de la page principale Page vide Abonnements - Page de Flux - Page de la chaîne + Fil de syndication + Chaîne Sélectionner une chaîne Populaires Top 50 Nouveau & populaire - En file d\'attente sur le lecteur en arrière-plan - En file d\'attente sur le lecteur en fenêtré + En file d’attente sur le lecteur en arrière-plan + En file d’attente sur le lecteur flottant Tout lire - Impossible de jouer ce flux - Une erreur irrécupérable du lecteur s\'est produite - Pas encore d\'abonnements de chaînes + Impossible de lire ce flux + Une erreur irrécupérable du lecteur est survenue + Pas encore d’abonnements de chaîne Lecteur en arrière-plan - Lecteur en fenêtré + Lecteur flottant Retirer Détails - Paramètres audio - Afficher l\'astuce « Maintenir pour ajouter » - Afficher l\'aide \"Appui long pour mettre en file d\'attente\" en appuyant sur les boutons \"Arrière-plan\" et \"Fenêtre\" sur la page de détails d\'une vidéo + Paramètres audios + Afficher l’astuce « Maintenir pour ajouter » + Afficher l’astuce lors de l’appui du bouton « Arrière-plan » ou « Mode flottant » sur la page de détails d’une vidéo [Inconnu] - Récupération de l\'erreur du lecteur - Page Kiosque + Récupération depuis l’erreur du lecteur + Kiosque Sélectionner un kiosque Kiosque - Appui long pour mettre en file d\'attente - Mettre en file d\'attente en arrière-plan - Mettre en file d\'attente en fenêtré - Commencer la lecture ici - Démarrer ici en arrière-plan - Démarrer ici en fenêtré + Maintenir pour mettre en file d’attente + Mettre en file d’attente en arrière-plan + Mettre en file d’attente dans une nouvelle fenêtre flottante + Démarrer la lecture ici + Démarrer la lecture en arrière-plan + Démarrer la lecture dans une nouvelle fenêtre flottante Donner NewPipe est développé par des volontaires sur leur temps libre afin de vous proposer la meilleure expérience possible. Vous pouvez leur offrir un café pour les soutenir dans leurs efforts et rendre NewPipe encore meilleur. - Site - Visitez le site internet de NewPipe pour plus d\'informations et de nouvelles. + Site web + Visitez le site web de NewPipe pour plus d’informations et de nouvelles. Donner en retour Pays du contenu par défaut Rotation - Arrière-plan - Fenêtré - Normal + Passer en arrière-plan + Passer en flottant + Passer en principal Service Ouvrir le menu Fermer le menu Aucun lecteur de flux trouvé (vous pouvez installer VLC pour le lire). Toujours Une seule fois - Les lecteurs externes ne supportent pas ces types de liens - Lien non valide + Les lecteurs externes ne prennent pas en charge ces types de liens + Lien invalide Aucun flux vidéo trouvé Aucun flux audio trouvé Lecteur vidéo Lecteur en arrière-plan - Lecteur en fenêtré + Lecteur flottant Obtention des infos… - Chargement du contenu - Importer les données - Exporter les données + Chargement du contenu demandé + Importer la base de données + Exporter la base de données Remplace votre historique et vos abonnements actuels - Exporter votre historique, vos abonnements et vos listes de lecture + Exporter l’historique, les abonnements et les listes de lecture Exporté Importé Aucun fichier ZIP valide - Avertissement: Impossible d\'importer tous les fichiers. - Cela effacera vos paramètres actuels + Avertissement : impossible d’importer tous les fichiers. + Cela effacera vos paramètres actuels. Afficher les infos - Marque-pages + Listes de lecture enregistrées Ajouter à - Faites glisser pour réorganiser + Glisser pour réordonner Créer - Ignorer + Rejeter Renommer Dernière lecture Tout supprimer - Voulez-vous supprimer cet élément de votre historique \? - Êtes-vous sûr de supprimer tout votre historique \? - Vidéos les plus regardées + Voulez-vous supprimer cet élément de l’historique de vues \? + Êtes-vous sûr de vouloir supprimer tout les éléments de l’historique \? + Vidéos les plus vues Toujours demander Nouvelle liste de lecture Supprimer Renommer Nom - Ajouter à la playlist - Enregistrer la playlist en local - Marquer cette playlist - Retirer la marque - Supprimer cette liste de lecture \? + Ajouter à la liste de lecture + Définir comme miniature de la liste de lecture + Enregister la liste de lecture + Retirer le signet + Voulez-vous supprimer cette liste de lecture \? Liste de lecture créée Ajouté à la liste de lecture Miniature de la liste de lecture changée. Impossible de supprimer la liste de lecture. - Aucuns sous-titres + Aucun sous-titre Ajuster - Zoom - Taille des sous-titres - Petite - Normale - Grande - Recherche rapide approximative - Permettre au lecteur d\'accéder plus rapidement à une position au détriment de la précision + Zoomer + Utiliser la recherche rapide approximative + Permettre au lecteur d’accéder plus rapidement à une position au détriment de la précision Charger les miniatures - Désactivez pour empêcher le chargement des miniatures afin de réduire l’utilisation de bande passante et de mémoire. Ce changement vide le cache d’images en mémoire vive et sur le disque. + Désactiver pour empêcher le chargement des miniatures, afin de réduire l’utilisation de bande passante et de mémoire. Modifier cette option vide les caches d’image en mémoire vive et sur le disque. Images en cache effacées - Effacer les données en cache + Effacer les métadonnées en cache Effacer toutes les pages web mises en cache - Données en cache effacées + Métadonnées en cache effacées Fichier Aucun dossier de ce type - Aucun fichier/contenu de ce type - Le fichier n’existe pas ou n’est pas accessible en lecture/écriture + Aucun fichier ou contenu de ce type + Le fichier n’existe pas ou n’est pas accessible en lecture ou en écriture Le nom du fichier ne peut être vide - Une erreur s\'est produite: %1$s + Une erreur est survenue : %1$s Supprimer un seul média - Quelque chose va bien bientôt arriver ;D + Quelque chose va bientôt apparaître ici ;D Télécharger le fichier de flux - Vidéo suivante en file d\'attente - Ajout automatique d\'un morceau suggéré lors de la lecture du dernier morceau dans une file d\'attente non bouclée. + Vidéo suivante en file d’attente + Ajout automatique d’un morceau suggéré lors de la lecture du dernier morceau dans une file d’attente non bouclée Débogage Remplir Générés automatiquement Activer LeakCanary - La surveillance de la mémoire peut mettre temporairement l\'application en pause pendant les nettoyages - Signaler les erreurs de développement hors cycle - Forcer le signalement des exceptions Rx qui surviennent hors activité + La surveillance des fuites de mémoire peut geler l’application durant le vidage du tas + Rapporter les erreurs hors cycle de vie + Forcer le rapport des exceptions Rx inlivrables en dehors des fragments ou activités durant le cycle de vie après traitement Importer/exporter Importer Importer de Exporter vers Importation en cours… Exporation en cours… - Importer fichier + Importer le fichier Export précédent - Impossible d\'importer des abonnements - Impossible d\'exporter les abonnements - "Pour importer vos abonnements YouTube vous devez d\'abord télécharger un fichier spécial de YouTube, selon les modalités suivantes : -\n -\n1. Suivez ce lien : %1$s -\n2. Connectez-vous à votre compte lorsque ce sera demandé -\n3. Un téléchargement va démarrer (ce sera celui du fichier nécessaire à l\'importation des abonnements)" - Importez un profil SoundCloud en saisissant l’URL de votre profil ou votre identifiant (ID). + Impossible d’importer les abonnements + Impossible d’exporter les abonnements + Veuillez importer vos abonnements YouTube en téléchargeant le fichier d’exportation. \n -\n1. Activer le « mode bureau » dans votre navigateur (le site n’est pas disponible pour les appareils mobiles). -\n2. Suivez cette URL : %1$s +\n1. Suivez ce lien : %1$s. +\n2. Connectez-vous à votre compte. +\n3. Un téléchargement va démarrer (celui du fichier d’exportation). + Veuillez importer un profil SoundCloud en saisissant l’URL de votre profil ou votre identifiant. +\n +\n1. Activez le « mode bureau » dans votre navigateur web (le site n’est pas disponible pour les appareils mobiles). +\n2. Suivez cette URL : %1$s. \n3. Connectez-vous à votre compte. -\n4. Copier l’URL vers lequel vous venez d’être redirigé. - votreID, soundcloud.com/votreid - Cette opération peut consommer beaucoup de données mobiles. -\n -\nSouhaitez-vous continuer ? - Vitesse de lecture +\n4. Copiez l’URL du profil vers lequel vous venez d’être redirigé. + votre identifiant, soundcloud.com/votreidentifiant + Cette opération peut charger énormément la connexion réseau. +\n +\nVoulez-vous continuer \? + Contrôles de vitesse de lecture Cadence - Détacher (déformations possibles) + Détacher (peut causer des déformations) Défaut Ouvrir de préférence avec - Action par défaut lors de l\'ouverture de contenu - %s + Action par défaut lors de l’ouverture de contenu — %s Aucun flux disponible au téléchargement Sous-titres - Modifier la taille du texte et les styles d\'arrière-plan du lecteur. Redémarrage requis pour prendre effet. + Modifier la taille du texte et les styles d’arrière-plan des sous-titres du lecteur. Le redémarrage de l’application est requis pour appliquer les changements. Ton - Nightcore Aucune application installée pour lire ce fichier - Effacer l\'historique - Supprimer l\'historique des flux regardés - Supprimer tout l\'historique regardé \? - Historique des vidéos vues supprimé. - Supprimer l\'historique des recherches - Supprimer l\'historique de recherche par mot clef - Supprimer tout l\'historique de recherche \? - Historique des recherches effacé. + Effacer l’historique des vues + Supprimer l’historique des flux lus et des positions de reprise + Voulez-vous supprimer tout l’historique des vues \? + Historique des vues supprimé. + Supprimer l’historique de recherche + Supprimer l’historique de recherche par mots-clés + Voulez-vous supprimer entièrement l’historique de recherche \? + Historique de recherche supprimé. 1 élément supprimé. - "NewPipe est un logiciel sous licence libre : Vous pouvez l\'utiliser, l\'étudier, le partager et l\'améliorer comme bon vous semble. Vous pouvez le redistribuer et/ou le modifier sous les termes de la licence générale publique GNU, comme publiée par la Free Software Foundation, dans sa version 3, ou, à votre convenance, dans une version plus récente." + NewPipe est un logiciel sous licence libre copyleft : vous pouvez l’utiliser, l’étudier, le partager et l’améliorer comme bon vous semble. Plus précisément, vous pouvez le redistribuer ou le modifier sous les termes de la licence générale publique GNU, comme publiée par la Free Software Foundation, dans sa version 3, ou, à votre convenance, dans une version quelconque version ultérieure. Politique de confidentialité de NewPipe Lire la politique de confidentialité Voulez-vous également importer des paramètres \? Accepter Refuser - Le projet NewPipe prend votre vie privée très à cœur. Ainsi, l’application n’envoie aucune donnée sans votre consentement. + Le projet NewPipe prend votre vie privée très à cœur. Par conséquent, l’application n’envoie aucune donnée sans votre consentement. \nLa politique de confidentialité de NewPipe explique en détail quelles données sont envoyées et stockées lorsque vous envoyez un rapport de plantage. - Afin de se conformer au Règlement Général sur la Protection des Données (RGPD ou GDPR), nous attirons votre attention sur la politique de vie privée de NewPipe. Merci de la lire attentivement. -\nVous devez l\'accepter pour nous envoyer le rapport de bug. - Pas de limite - Limiter la résolution en données mobile + Afin de se conformer au Règlement Général sur la Protection des Données (RGPD), nous attirons votre attention sur la politique de confidentialité de NewPipe. Veuillez la lire attentivement. +\nVous devez l’accepter pour nous envoyer le rapport de bogue. + Aucune limite + Limiter la définition lors de l’utilisation des données mobiles Chaînes Listes de lecture Pistes @@ -403,74 +397,113 @@ Accélérer pendant les silences Étape Réinitialiser - Minimiser lors du changement d\'application - Action lors du changement d\'application depuis le lecteur vidéo —%s + Minimiser lors du changement d’application + Action lors du basculement à une autre application depuis le lecteur vidéo — %s Aucune Minimiser pour lire en arrière-plan - Minimiser vers le lecteur miniature + Minimiser pour lire en mode flottant Se désabonner Nouvel onglet - Sélectionner l\'onglet + Sélectionner un onglet Contrôle gestuel du volume Utiliser des gestes pour contrôler le volume du lecteur Contrôle gestuel de la luminosité Utiliser des gestes pour contrôler la luminosité du lecteur Mises à jour Fichier supprimé - Notification de mise à jour de l\'application + Notification de mise à jour de l’application Notifications pour la nouvelle version de NewPipe Stockage externe indisponible Restaurer les valeurs par défaut - Voulez-vous restaurer les valeurs par défaut \? - Nombre d\'abonnés non disponible + Voulez-vous restaurer les valeurs par défaut \? + Comptage du nombre d’abonnés indisponible Sélection Arrêter - Événements - Télécharger vers la carte SD n\'est pas encore possible. Voulez-vous réinitialiser l\'emplacement du dossier \? - Quels onglets seront visibles sur la page principale + Évènements + Impossible de télécharger dans la carte mémoire externe. Voulez-vous réinitialiser l’emplacement du dossier de téléchargement \? + Sélection des onglets à afficher sur la page principale Mises à jour - Afficher une notification pour proposer une mise à jour de l\'application lorsqu\'une nouvelle version est disponible + Afficher une notification pour proposer une mise à jour de l’application lorsqu’une nouvelle version est disponible Liste Grille Auto Changer de vue - Une mise à jour de NewPipe disponible ! - Appuyez pour télécharger + Une mise à jour de NewPipe disponible ! + Appuyer pour télécharger Terminé - Dans la file d\'attente - En pause + En attente + en pause Téléchargement échoué - Délai de connection dépassé + Délai de connexion dépassé Conférences Téléchargement terminé %s téléchargements terminés - Ajouté à la file d\'attente + Ajouté à la file d’attente Générer un nom unique Écraser Un fichier avec ce nom existe déjà Un fichier téléchargé avec ce nom existe déjà Il y a un téléchargement en cours avec ce nom - Afficher l\'erreur + Afficher l’erreur Code - Le fichier ne peut pas être créé - Le dossier de destination ne peut pas être créé + Le dossier de destination ne peut pas être créé + Le fichier ne peut pas être créé Autorisation refusée par le système - Échoué de la connexion sécurisée - Le serveur est introuvable + La connexion sécurisée a échoué + Impossible de trouver le serveur Impossible de se connecter au serveur Le serveur n’envoie pas de données Introuvable Effacer les téléchargements terminés - Mettre en pause lors du passage en données mobiles - Les téléchargements qui ne peuvent pas être mis en pause seront redémarrés - Mode liste + Interrompre sur les connexions limitées + Utile lors du passage aux données mobiles, bien que certains téléchargements ne peuvent pas être suspendus + Mode d’affichage en liste post-traitement File d’attente Action refusée par le système - Échec du post-traitement + Le post-traitement a échoué Nombre maximum de tentatives - Nombre maximum de tentatives avant d\'annuler le téléchargement + Nombre maximum de tentatives avant d’annuler le téléchargement Utilisation des onglets par défaut, erreur lors de la lecture des onglets enregistrés - Le serveur n\'accepte pas les téléchargements multi-threads, réessayez avec @string/msg_threads = 1 + Le serveur n’accepte pas les téléchargements multi-fils, veuillez réessayer avec @string/msg_threads = 1 Continuer vos %s transferts en attente depuis Téléchargement + Le domaine désiré n\'est pas disponible + Afficher les commentaires + Désactiver pour ne pas afficher les commentaires + Lecture automatique + + Commentaire + Commentaires + + Aucun commentaire + Impossible de charger les commentaires + Fermer + Reprendre la lecture + Effacer les données + Fichier déplacé ou supprimé + impossible d’écraser le fichier + Il y a un téléchargement en attente avec ce nom + NewPipe a été fermé alors qu’il travaillait sur le fichier + Aucun espace disponible sur le périphérique + Progression perdue, car le fichier a été effacé + Êtes-vous sûr \? + Limiter la file d’attente de téléchargement + Un téléchargement s’exécutera en même temps + Démarrer les téléchargements + Mettre en pause les téléchargements + Demander où télécharger + Vous allez être interrogé sur l’emplacement d’enregistrement de chaque téléchargement + Vous allez être interrogé sur l’emplacement de téléchargement de chaque téléchargement. +\nVeuillez choisir SAF si vous voulez télécharger sur une carte mémoire externe + Rétablir la précédente position de lecture + Positions dans les listes + Afficher les indicateurs de position de lecture dans les listes + Positions de reprise supprimées. + Utiliser SAF + Le « Storage Access Framework » permet de télécharger sur une carte mémoire externe. +\nNote : certains appareils ne sont pas compatibles + Supprimer les positions de lecture + Supprimer toutes les positions de reprise + Voulez-vous supprimer toutes les positions de reprise \? + Changez les dossier de téléchargement pour activer \ No newline at end of file diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index 5f11c4fab34..899a9be10aa 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -93,7 +93,6 @@ Este URL non está soportado País predeterminado para o contido Servizo - Idioma predeterminado do contido Reprodutor Comportamento Vídeo e audio @@ -152,7 +151,7 @@ Limpar historial de reproducións Elimina o historial de emisións reproducidas Elimina todo o historial de reproducións. - O historial de reproducións foi eliminado. + O historial de reproducións foi eliminado. Limpar o historial de procura Elimina o historial de termos procurados Elimina todo o historial de procura. diff --git a/app/src/main/res/values-he/strings.xml b/app/src/main/res/values-he/strings.xml index a2ff85010b5..6f826fdf001 100644 --- a/app/src/main/res/values-he/strings.xml +++ b/app/src/main/res/values-he/strings.xml @@ -22,12 +22,12 @@ מצב חלון צף של NewPipe רקע חלון צף - נתיב להורדת סרטונים - נתיב מיקום לאחסון סרטונים - נא להקליד נתיב לשמירת סרטונים + תיקייה להורדת סרטונים + קובצי וידאו שהורדת מאוחסנים כאן + נא לבחור תיקייה לשמירת קובצי סרטונים תיקיית הורדות שמע - הורדות שמע נשמרות כאן - נא להקליד נתיב לשמירת קובצי שמע + קובצי שמע שהורדת מאוחסנים כאן + נא לבחור תיקייה לשמירת קובצי שמע ניגון אוטומטי מנגן סרטון כאשר NewPipe נפתח דרך יישומון אחר רזולוציית בררת המחדל @@ -108,7 +108,7 @@ מה חדש היסטוריית חיפוש שמירת שאילתות החיפוש מקומית - היסטוריה ומטמון + היסטוריית צפייה תיעוד הסרטונים שנצפו להמשיך את הניגון עם החזרת המיקוד להמשיך לנגן לאחר הפרעות (למשל: שיחות טלפון) @@ -132,7 +132,7 @@ ההערה שלך (באנגלית): פרטים: תמונה ממוזערת לתצוגה המקדימה של הסרטון - תמונות ממוזערות לתצוגה המקדימה של הסרטון + נגינת סרטון, משך: תמונה ייצוגית של המפרסם אהבו לא אהבו @@ -148,9 +148,9 @@ שמע ניסיון חוזר הגישה לאחסון נדחתה - K - M - B + ק׳ + מ׳ + ב׳ אין מנויים מנוי אחד @@ -167,8 +167,8 @@ אין סרטונים - סרטון - שני סרטונים + %s סרטון + %s סרטונים %s סרטונים %s סרטונים @@ -189,7 +189,7 @@ יש לגעת לפרטים נוספים נא להמתין… הועתק ללוח - נא לבחור תיקיית הורדה זמינה + נא לציין תיקיית הורדה בהגדרות בהמשך הרשאה זו נדרשת לטובת \nפתיחה בחלון צף reCAPTCHA @@ -250,11 +250,11 @@ פרטים אפשרויות שמע להחזיק כדי להוסיף לרשימת נגינה - להוסיף לרשימת הנגינה בעת נגינת רקע - הוספה לרשימת הנגינה בנגן הצף + להוסיף לרשימת הנגינה ברקע + הוספה לתור בנגן צף חדש להתחיל לנגן מכאן - "להתחיל מכאן כאשר נגן הרקע מופעל" - להתחיל כאן בנגן הצף + להתחיל לנגן ברקע + להתחיל לנגן בחלון צף חדש הורדת קובץ הזרמה הצגת מידע רשימות נגינה מסומנות @@ -277,7 +277,7 @@ מטמון נתוני העל התרוקן ייצוא היסטוריה, מינויים ורשימות נגינה מחיקת היסטוריית הצפייה - היסטוריית הצפייה נמחקה. + היסטוריית הצפייה נמחקה. מחיקת היסטוריית החיפוש היסטוריית החיפוש נמחקה. הקובץ אינו קיים או שחסרה הרשאה לקרוא אותו או לכתוב אליו @@ -342,7 +342,7 @@ החלפת כיווניות העברה לראשי משכתב את ההיסטוריה והמינויים הנוכחיים שלך - מחיקת היסטוריית התזרימים שהתנגנו + מחיקת היסטוריית התזרימים שהתנגנו ומיקומי הנגינה ערוצים רשימות נגינה רצועות @@ -407,7 +407,7 @@ התראת עדכון יישומון התראות על גרסה חדשה של NewPipe האחסון החיצוני אינו זמין - אין עדיין אפשרות להוריד לכרטיס SD. לאפס את מיקום תיקיית ההורדה\? + אין אפשרות להוריד לכרטיס SD. לאפס את מיקום תיקיית ההורדה\? נעשה שימוש בלשוניות בררת המחדל, אירעה שגיאה בעת קריאת הלשוניות שנשמרו שחזור בררות מחדל לשחזר את בררות המחדל\? @@ -469,7 +469,50 @@ עצירה מספר הניסיונות החוזרים המרבי מספר הניסיונות החוזרים המרבי בטרם ביטול ההורדה - להשהות בעת מעבר לתקשורת נתונים סלולרית - הורדות שלא ניתן להשהות יופעלו מחדש + לייצר הפרעה ברשתות מדודות + שימושי בעת מעבר לחיבור רשת סלולרית, למרות שישנן הורדות שלא ניתן להשהות + הצגת תגובות + יש להשבית כדי להפסיק הצגת תגובות + ניגון אוטומטי + + תגובות + + + + + אין תגובות + לא ניתן לטעון תגובות + סגירה בהמתנה + להמשיך בנגינה + לשחזר את מיקום הנגינה האחרון + מיקומים ברשימות + להציג מחווני מיקומי נגינה ברשימות + לנקות את הנתונים + מיקומי הנגינה נמחקו. + הקובץ הועבר או נמחק + כבר קיים קובץ בשם הזה + לא ניתן לשכתב על הקובץ + כבר יש הורדה ממתינה בשם הזה + NewPipe נסגר בזמן העבודה על הקובץ + לא נשאר מקום במכשיר + התהליך אבד כיוון שהקובץ נמחק + החיבור המתין זמן רב מדי + בוודאות\? + הגבלת תור ההורדה + רק הורדה אחת תרוץ בו־זמנית + התחלת הורדות + השהיית הורדות + לשאול לאן להוריד + תופיע שאלה לאן לשמור כל הורדה + תוצג שאלה היכן לשמור כל הורדה. +\nיש להפעיל זאת אם ברצונך להוריד לכרטיס SD חיצוני + שימוש ב־SAF + תשתית גישה לאחסון מאפשרת הורדות לכרטיס SD חיוני. +\nלתשומת לבך: חלק מהמכשירים אינם נתמכים + מחיקת מיקומי נגינה + מחיקת כל מיקומי הנגינה + למחוק את מיקומי הנגינה\? + יש להחליף את תיקיות ההורדה כדי שייכנס לתוקף + הפעלה/כיבוי שירות, בחירה נוכחית: \ No newline at end of file diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml index d2877a9df5e..9c3278d7c47 100644 --- a/app/src/main/res/values-hi/strings.xml +++ b/app/src/main/res/values-hi/strings.xml @@ -23,7 +23,7 @@ ऑडियो हलका काली - इतिहास व कॅशे + देखे हुए वीडियो की सूची डाउनलोड अगला वीडियो और ऑडियो @@ -63,12 +63,12 @@ सदस्यता नहीं बदला जा सका सदस्यता का अद्यतन नहीं हो सका देखे की क्या नया है - विडियो को डाउनलोड करने के लिए फाइल की जगह - डाउनलोड किए गए विडियो फाइल को रखने की जगह - वीडियो के लिए डाउनलोड पथ दर्ज करें + वीडियो डाउनलोड फ़ोल्डर + डाउनलोड की गई वीडियो फ़ाइलें यहां संग्रहीत हैं + वीडियो फ़ाइलों के लिए डाउनलोड फ़ोल्डर चुनें ऑडियो डाउनलोड फ़ोल्डर - डाउनलोड किये गए ऑडियो यहाँ है - ऑडियो फाइल डाउनलोड करने के लिए जगह दर्ज करें + डाउनलोड की गई वीडियो फ़ाइलें यहां संग्रहीत हैं + ऑडियो फ़ाइलों के लिए डाउनलोड फ़ोल्डर चुनें अन्य अप्प के द्वारा NewPipe के आह्वान पर वीडियो तुरंत चले वीडियो का डिफ़ॉल्ट रिज़ॉल्यूशन विडियो पॉपअप का डिफ़ॉल्ट रिज़ॉल्यूशन @@ -110,7 +110,7 @@ विषयवस्तु उम्र प्रतिबंधित विषय वस्तु उम्र प्रतिबंदित विडियो है .इस प्रकार की विषयवस्तु को अनुमति देने के लिए सेटिंग से संभव है | - सीधा प्रसारण + लाइव डाउनलोड डाउनलोड त्रुटी की रिपोर्ट @@ -184,8 +184,8 @@ %s दर्शके - %s विडियो - %s वीडियो + वीडियो + वीडियोस शुरू रोके @@ -310,10 +310,6 @@ फिट भरें ज़ूम करें - कैप्शन फ़ॉंट आकार - छोटे फ़ॉंट - सामांय फ़ॉंट - बड़ा फ़ॉंट डीबग करें ऑटो-जनरेटेड LeakCanary सक्षम करें @@ -332,12 +328,12 @@ फाइल चेनल्स सूची - ट्रेक + क्स उपभोगता देखे हुए वीडियो की सूची साफ करें चलाये गए स्ट्रीम का इतिहास साफ करता है देखे गए सभी का इतिहास साफ करें\? - देखे हुए का इतिहास साफ कर दिया गया। + देखे हुए का इतिहास साफ कर दिया गया। ढूंढने के इतिहास को साफ करें ढूंढे गए शब्दो का इतिहास साफ करता है पूरे खोज इतिहास को मिटा दे \? diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index a85ea64501e..e85d5810ec3 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -245,10 +245,10 @@ Doniraj Web stranica Ovdje započni reprodukciju - Ovdje započni repr. u pozadini + Započni reprodukciju u pozadini Dodaj na red čekanja u pozadini Dodaj na red u novom skočnom prozoru - Započni ovdje u Skočnom prozoru + Započni reprodukciju u skočnom prozoru Otvori ladicu Zatvori ladicu Nešto će se uskoro pojaviti :D @@ -276,10 +276,6 @@ Ispuniti Povećaj Auto generirano - Veličina fonta naslova - Manji font - Normalni font - Veći font Omogući \"LeakCanary\" Monitoring curenja memorije može uzrokovati greške u radu aplikacije prilikom odlaganje gomile Izvijestite o pogreškama izvan životnog ciklusa @@ -307,7 +303,7 @@ Očisti povijest gledanja Briše povijest reproduciranih streamova Obriši cijelu povijest gledanja\? - Povijest gledanja izbrisana. + Povijest gledanja izbrisana. Obriši povijest pretraživanja Obriši cijelu povijest pretraživanja\? Povijest pretraživanja obrisana. @@ -392,7 +388,7 @@ Uklonite sve podatke iz privremenih web-stranica Metapodaci su izbrisani Automatski dodaj u red sljedeće strujanje - Automatsko dodavanje povezanog videozapisa tijekom reprodukcije posljednjeg videozapisa u neponavljajućem redu. + Automatsko dodavanje povezanog videozapisa tijekom reprodukcije posljednjeg videozapisa u neponavljajućem redu Kontrola glasnoće pomoću gesti Koristi gesture za kontrolu glasnoće Kontrola svjetline pomoću gesti @@ -427,7 +423,7 @@ \n2. Idite na ovaj URL: %1$s \n3. Ulogirajte se \n4. Kopirajte URL profila na koji ste preusmjereni. - Tempo + brzina Visina tona Prekini vezu (može uzrokovati izobličenje) Minimiziraj prilikom mjenjanje aplikacija @@ -468,4 +464,19 @@ Maksimalni broj pokušaja prije poništavanja preuzimanja Pauziraj prilikom prebacivanja na mobilne podatke Preuzimanja koja se ne mogu zaustaviti ponovno će se pokrenuti + Prikaži komentare + Onemogućite da biste prestali prikazivati komentare + Automatska reprodukcija + + Komentari + + + + Nema komentara + Komentare nije moguće učitati + Zatvori + NewPipe je copyleft libre software: možete ga koristiti, proučavati i poboljšavati po volji. Konkretno, možete ga redistribuirati i / ili modificirati pod uvjetima GNU opće javne licence koju je objavila Free Software Foundation, bilo verzije 3 Licence, ili (po vašem izboru) bilo koje kasnije verzije. + "Projekt NewPipe ozbiljno shvaća vašu privatnost. Stoga aplikacija ne prikuplja nikakve podatke bez vašeg pristanka. +\nNewPipe pravila o privatnosti detaljno objašnjavaju koji se podaci šalju i pohranjuju kada šaljete izvješće o padu aplikacije." + Kako bismo se uskladili s Europskom općom uredbom o zaštiti podataka (GDPR), upozoravamo vas na politiku privatnosti tvrtke NewPipe. Pažljivo ga pročitajte. Morate ga prihvatiti da nam pošaljete izvješća o pogreškama. \ No newline at end of file diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 251f4cc3f29..4d7ff986edb 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -1,4 +1,4 @@ - + %1$s megtekintés Közzétéve: %1$s @@ -29,15 +29,11 @@ Nem támogatott webcím Külső videólejátszó használata Külső hanglejátszó használata - Add meg a hangfájlok letöltési helyét - Tor használata (Kísérleti) Adatforgalom Tor-on keresztüli kényszerítése a biztonság fokozása érdekében (a videó stream-elés még nem támogatott). - Lejátszás Hálózati hiba - Lejátszás háttérben Videó és audio Megjelenés @@ -46,10 +42,9 @@ \'Következő\' és \'Hasonló\' videók mutatása Sötét Világos - Téma Hangfájlok letöltési helye - Útvonal a letöltött hangfájlok tárolásához + Letöltött hangfájlok itt találhatók Tetszik Nem tetszik Előnézeti kép @@ -66,14 +61,11 @@ Videók automatikus lejátszása, ha a NewPipe egy másik alkalmazásból lett indítva Korhatáros videó mutatása. Ennek a tartalomnak az engedélyezése a \"Beállítások\"-ban lehetséges. ÉLŐ - JELENTÉS Információ: Ez történt: Megjegyzésed (angolul): Részletek: - - Sajnos hiba történt. Elnézést, ennek nem kellett volna megtörténnie. Hibajelentés e-mailben @@ -84,7 +76,6 @@ Újra Hibajelentés Felhasználói jelentés - Videó Audio A kezdéshez koppints a keresésre @@ -94,15 +85,12 @@ Letöltések Letöltések Hibabejelentés - Indít Szünet Lejátszás Törlés Ellenőrző összeg - Rendben - Fájlnév Threadek Hiba @@ -111,41 +99,38 @@ NewPipe letöltés folyamatban Katt a részletekért Kérlek várj… - Vágólapra másolva. + Vágólapra másolva Kérlek válassz egy létező könyvtárat a letöltésekhez. - Nem támogatott szerver Új küldetés -Csatornáról leiratkozva + Csatornáról leiratkozva Nem sikerült megváltoztatni a feliratkozást "Nem sikerült frissíteni a feliratkozást " Főoldal Feliratkozások Könyvjelzőzött lejátszási listák - Újdonságok - Háttér Felugró ablak Nem található stream lejátszó alkalmazás (feltelepítheted a VLC-t a lejátszáshoz). Megnyitás felugró ablakként Néhány felbontásnál eltávolítja a hangot - NewPipe felugró ablak mód + NewPipe felugró ablak Feliratkozás Feliratkozva Több infó - Alapértelmezett felugró ablak felbontása Mutassa a magasabb felbontásokat Csak néhány eszköz támogatja a 2K/4K videók lejátszását Alapértelmezett videó formátum - Fekete + Fekete +\n Jegyezze meg a felugró ablak helyét és méretét Jegyezze meg a felugró ablak előző helyét és méretét Keresési javaslatok Mutasson javaslatokat keresés közben Keresési előzmények - Előzmények és gyorsítótár + Előzmények Megnézett videók nyomon követése "Lejátszás folytatása félbeszakítás után (pl.: telefonhívás) " Lejátszó @@ -155,7 +140,7 @@ Hibaelhárítás Lejátszás felugró ablakban Felugró ablak várólistájához adva - Mind + Összes Csatorna Lejátszási lista Igen @@ -170,12 +155,9 @@ Összes lejátszása Mindig Csak egyszer - NewPipe Értesítés Értesítések a NewPipe háttér- és felugró ablak lejátszójához - [Ismeretlen] - Adatbázis importálása Adatbázis exportálása Felülírja a jelenlegi előzményeket és feliratkozásokat @@ -187,16 +169,14 @@ Hibás cím Nem található videó formátum Nem található hang csatorna - Mi:\\nKérés:\\nTartalom nyelve:\\nSzolgáltatás:\\nGMT Idő:\\nCsomag:\\nVerzió:\\nOperációs Rendszer verzió: Nincs találat Adatfolyam fájl letöltése - Hozzáadás - + Hozzáadás ehhez Gyorsabb, de pontatlan tekerés használata A pontatlan tekerés lehetővé teszi, hogy gyorsabban ugorjon a pozíciókra, de kevesebb pontossággal Bélyegképek betöltése - Kapcsold ki, hogy a bélyegképek ne legyenek betöltve és mentve, így csökkentve az adat és memória használatot. Ennek az értéknek a megváltoztatása törli a memóriában és a meghajtón lévő bélyegkép gyorsítótárat + Kapcsold ki, hogy a megelőzzed bélyegképek betöltését, így csökkentve az adat és memória használatot. Ennek az értéknek a megváltoztatása törli a memóriában és a meghajtón lévő bélyegkép gyorsítótárat. A bélyegkép gyorsítótár törölve Gyorsítótárazott metaadat törlése Minden gyorsítótárazott weboldal adat törlése @@ -209,13 +189,12 @@ Zeneszámok Felhasználók Fájl - Folytatás a háttérben Folytatás felugró ablakban Megtekintési előzmények törlése Eltávolítja a megtekintési előzményeket Törlöd az összes megtekintési előzményt\? - Megtekintési előzmények törölve. + Megtekintési előzmények törölve. Keresési előzmények törlése Eltávolítja a kereséshez használt kifejezéseket az előzményekből Törlöd az összes keresési előzményt\? @@ -228,54 +207,42 @@ A fájl neve nem lehet üres Hiba történt: %1$s Nincs letölthető adatforrás - Itt nincs semmi Húzza az átrendezéshez - e M Mrd - Nincs feliratkozó - %s feliratkozó - %s feliratkozó - - + %s feliratkozó + %s feliratkozó + Nincs megtekintés - %s megtekintés - %s megtekintés - - + %s megtekintés + %s megtekintés + Nincs videó - %s videó - %s videó - - + %s videó + %s videók + Létrehozás Egy törlése Összes törlése Átnevezés - Ez az engedély szükséges a felugró ablakban történő megnyitáshoz 1 elem törölve. - reCAPTCHA reCAPTCHA rejtvény reCAPTCHA rejtvény igényelve - Letöltés Fájlnevekben engedélyezett karakterek Érvénytelen karakterek ezzel az értékkel kerülnek helyettesítésre Csere karakter - Betűk és számok Legtöbb speciális karakter - Nincs a fájl lejátszásához szükséges alkalmazás telepítve - A NewPipe alkalmazásról Beállítások Az alkalmazásról @@ -299,8 +266,6 @@ Az adatvédelmi irányelvek elolvasása A NewPipe engedélye Engedély elolvasása - - Előzmények Keresési előzmények Megtekintési előzmények @@ -314,7 +279,6 @@ Biztosan törölni kíván minden elemet az előzmények közül\? Utoljára lejátszott Legtöbbet lejátszott - Főoldal tartalma Üres oldal Újságárus oldal @@ -330,7 +294,6 @@ Figyelmeztetés: nem sikerült az összes fájl importálása. Ez felül fogja írni a jelenlegi beállításokat. A beállításokat is importálni kívánja\? - Újságárus Felkapott Top 50 @@ -340,59 +303,43 @@ Részletek Hang beállítások Itt hamarosan megjelenik valami :) - - Alapértelmezett tevékenység „%s” típusú tartalom megnyitásakor - Videólejátszó Lejátszás háttérben Felugró ablakos lejátszás Mindig kérdezz rá - Információk gyűjtése… Kért tartalom betöltése - Új lejátszási lista létrehozása Lejátszási lista törlése Lejátszási lista átnevezése Név Lejátszási listához adás Beállítás lejátszási lista előképeként - Könyvjelző törlése - Kívánja törölni ezt a lejátszási listát\? Lejátszási listsa létrehozva Lejátszási listához hozzáadva Lejátszási lista előképe megváltozott Nem sikerült a lejátszási lista törlése - Felirat kikapcsolva - Illeszkedés Kitöltés Közelítés - Automatikusan létrehozott - Feliratok Feliratok méretének és hátterének stílusbeli módosítása. A módosítások életbelépésehez az alkalmazás újraindítása szükséges. - LeakCanary bekapcsolása Import/Export Import Importálás a következőből Exportálás a következőbe - Importálás… Exportálás… - Fájl importálása Előző exportálás - Sikertelen a feliratkozások importálása Sikertelen a feliratkozások exportálása - Importálja YouTube feliratkozásait az export fájl letöltésével: \n \n1. Navigáljon erre az oldalra: %1$s @@ -405,29 +352,34 @@ \n3. Jelentkezzen be \n4. Másolja ki a profil URL-t, ahova át lett irányítva. azonosítód, soundcloud.com/azonosítód - Ez a művelet adatforgalom igényes lehet. \n \nFolytatni kívánja\? - Ütem Hangmagasság Előrepörgetés csend alatt Lépés Helyreállítás - Elfogadás Elutasítás - Nincs korlát Felbontás korlátozása mobilinternet használata esetén Művelet alkalmazás váltásakor a fő videólejátszóról — %s Ne tegyen semmit Lejátszás folytatása a háttérben Lejátszás folytatása felugró ablakban - -Lejátszás folytatása a fókusz visszaszerzésekor + Lejátszás folytatása a fókusz visszaszerzésekor Mutassa a \"Tartsa lenyomva a hozzáadáshoz\" tippet - Sorba állítva a háttérben lejátszáshoz + Várólistához adva a háttérben Elforgatás - + Leiratkozás + Új fül + Válassz fület + Kommentek mutatása + Kapcsold ki, hogy ne mutassa a kommenteket + Tartalmak alapértelmezett országa + Folytatás főnézetben + Figyelmen kívül hagy + Lejátszási lista könyvjelzők közé + Hasonló videó beadása az utolsó videó után egy nem ismétlődő sorban + \ No newline at end of file diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index a97cfe16b0c..0bbbbbe9edb 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -1,6 +1,6 @@ - Sentuh pencarian untuk memulai + Ketuk pencarian untuk memulai %1$s ditonton Dipublikasikan tanggal %1$s Pasang @@ -14,12 +14,12 @@ Pilih peramban Gunakan pemutar video eksternal Gunakan pemutar audio eksternal - Lokasi unduhan video - Lokasi untuk menyimpan video yang diunduh - Masukkan lokasi unduhan video + Folder unduhan video + Berkas video yang diunduh disimpan di sini + Pilih folder unduhan untuk berkas video Lokasi unduhan audio - Audio yang diunduh disimpan di sini - Masukkan lokasi unduhan berkas audio + Berkas audio yang diunduh disimpan di sini + Pilih folder unduhan untuk berkas audio Putar otomatis Putar video ketika NewPipe dijalankan dari aplikasi lain Resolusi @@ -97,7 +97,7 @@ Sentuh untuk detail Mohon tunggu… Disalin ke papan klip - Silakan pilih direktori unduhan yang tersedia + Silakan pilih folder unduhan di pengaturan Pemutar stream tidak ditemukan. Apakah anda ingin memasang VLC\? Tidak bisa dekripsi tanda tangan URL video App/UI rusak @@ -111,7 +111,7 @@ Hitam Semua Channel - R + r J T Ya @@ -171,7 +171,7 @@ Utama Riwayat pencarian Simpan pencarian secara lokal - Riwayat & Cache + Riwayat tontonan Notifikasi NewPipe Riwayat Riwayat dinonaktifkan @@ -183,7 +183,7 @@ Hapus tembolok metadata Buang semua data tembolok laman web Cache metadata dihapus - Otomatis tambahkan stream terkait ketika memutar stream terakhir dalam antrean tanpa perulangan. + Otomatis tambahkan stream terkait ketika memutar stream terakhir dalam antrean tanpa perulangan Simpan daftar video yang telah ditonton Tampilkan tip \"Tahan untuk menambahkan\" Tampilkan tip ketika tombol latar belakang atau popup disentuh pada halaman detail video @@ -235,9 +235,6 @@ %s ditonton Tidak ada video - - Video - Buat Hapus Satu Hapus Semua @@ -280,11 +277,11 @@ Detail Pengaturan Audio Tahan untuk mengantre - Antre saat di latar belakang + Antre di latar belakang Antre di popup baru Mulai putar di sini - Mulai dari sini ketika di latar belakang - Mulai dari sini pada popup baru + Mulai putar di latar belakang + Mulai putar di popup baru Buka Laci Tutup Laci Sesuatu akan segera muncul di sini ;D @@ -312,12 +309,7 @@ Isi Perbesar Otomatis dibuat - Ukuran fon deskripsi - Fon lebih kecil - Fon normal - Fon lebih besar Aktifkan LeakCanary - Nightcore Bawaan Pemutar stream tidak ditemukan (anda bisa memasang VLC untuk memutarnya). Unduh berkas stream @@ -325,9 +317,9 @@ Tampilkan info Tambahkan Ke Hapus riwayat tontonan - Hapus riwayat stream yang telah diputar + Hapus riwayat stream yang diputar dan posisi pemutaran Hapus seluruh riwayat tontonan\? - Riwayat tontonan dihapus. + Riwayat tontonan dihapus. Hapus riwayat pencarian Hapus riwayat lema pencarian Hapus seluruh riwayat pencarian\? @@ -417,7 +409,7 @@ Notifikasi Pembaruan Apl Notifikasi untuk versi NewPipe baru Penyimpanan eksternal tidak tersedia - Belum bisa mengunduh ke kartu SD eksternal. Setel ulang lokasi folder unduhan\? + Tidak bisa mengunduh ke kartu SD eksternal. Atur ulang lokasi folder unduhan\? Menggunakan tab baku, ralat saat membaca tab yang disimpan Kembali ke awal Apakah anda ingin kembali ke awal\? @@ -466,6 +458,45 @@ Berhenti Percobaan maksimum Jumlah upaya maksimum sebelum membatalkan unduhan - Berhenti ketika beralih ke data seluler - Unduhan yang tidak dapat dijeda akan diulang dari awal + Berhenti pada jaringan terbatas + Berguna saat beralih ke data seluler, walaupun beberapa unduhan tidak bisa ditangguhkan + Tampilkan komentar + Nonaktifkan untuk berhenti menampilkan komentar + Otomatis putar + + Komentar + + Tidak ada komentar + Tidak bisa memuat komentar + Tutup + Lanjutkan pemutaran + Pulihkan posisi pemutaran terakhir + Posisi dalam daftar + Tampilkan indikator posisi pemutaran di dalam daftar + Hapus data + Posisi pemutaran dihapus. + Berkas dipindah atau dihapus + Berkas dengan nama yang sama sudah ada + tidak bisa menimpa ulang berkas + Ada unduhan yang dijeda dengan nama ini + NewPipe telah ditutup saat sedang memproses berkas + Tidak ada ruang kosong tersisa pada perangkat + Kehilangan laju, karena berkas telah dihapus + Apakah anda yakin\? + Batasi antrean unduhan + Satu unduhan akan berjalan pada waktu yang bersamaan + Mulai unduh + Jeda unduh + Tanyakan lokasi unduhan + Anda akan ditanya lokasi penyimpanan berkas unduhan + Anda akan ditanya lokasi penyimpanan berkas unduhan. +\nPilih SAF jika anda ingin mengunduh ke kartu SD eksternal + Batas waktu koneksi + Gunakan SAF + Storage Access Framework memungkinkan mengunduh ke kartu SD eksternal. +\nCatatan: beberapa perangkat tidak kompatibel + Hapus posisi pemutaran + Hapus semua posisi pemutaran + Hapus semua posisi pemutaran\? + Ubah folder unduhan \ No newline at end of file diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index e301c01af9d..35fdebeda02 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -5,18 +5,18 @@ Nessun lettore multimediale trovato. Vuoi installare VLC\? Installa Annulla - Apri nel Browser + Apri nel browser Condividi Scarica Cerca Impostazioni Intendevi: %1$s\? Condividi con - Scegli Browser + Scegli browser rotazione - Percorso dei video scaricati - Cartella in cui salvare i video scaricati - Inserisci il percorso per i video scaricati + Cartella dei video scaricati + I video scaricati saranno salvati qui + Scegli la cartella per i video scaricati Risoluzione predefinita Riproduci con Kodi L\'applicazione Kore non è stata trovata. Vuoi installarla? @@ -31,17 +31,17 @@ Lingua predefinita per i contenuti Video e Audio Miniatura anteprima video - Miniatura anteprima video + Riproduci video, durata: Miniatura dell\'immagine di profilo dell\'utente Non mi piace Mi piace Impossibile creare la cartella di download \'%1$s\' Creata la cartella per i download \'%1$s\' - Usa Lettore Video Esterno - Usa Lettore Audio Esterno + Usa un lettore video esterno + Usa un lettore audio esterno Cartella degli audio scaricati - Cartella in cui salvare gli audio scaricati - Inserisci la cartella per gli audio scaricati + Gli audio scaricati saranno salvati qui + Scegli la cartella per gli audio scaricati Tema Scuro Chiaro @@ -102,7 +102,7 @@ Tocca per maggiori dettagli Attendi… Copiato negli appunti - Seleziona una cartella per il salvataggio dei download + Seleziona una cartella per i downloads Impossibile caricare l\'immagine L\'app/UI si è interrotta Cosa:\\nRichiesta:\\nLingua contenuto:\\nServizio:\\nOrario GMT:\\nPacchetto:\\nVersione:\\nVersione SO: @@ -117,8 +117,8 @@ È richiesta la risoluzione del reCAPTCHA Sì Più tardi - Apri in Modalità Popup - Modalità Popup di NewPipe + Apri in modalità popup + Modalità popup di NewPipe Riproduzione in modalità popup Disattivato Non riproduce l\'audio con ALCUNE risoluzioni @@ -160,14 +160,14 @@ Informazioni su NewPipe Iscriviti Iscritto - Disiscritto dal Canale + Disiscritto dal canale Impossibile cambiare l\'iscrizione Impossibile aggiornare l\'iscrizione Iscrizioni Novità Cronologia ricerche Salva le ricerche - Cronologia & Cache + Visualizza storico Salva la cronologia dei video visualizzati Riprendi tornando in primo piano Continua a riprodurre dopo le interruzioni (es. chiamate) @@ -205,8 +205,8 @@ Nessun video - Video - Video + %s video + %s video Elemento eliminato Nulla da mostrare @@ -242,8 +242,8 @@ In coda in sottofondo In coda nel riproduttore a comparsa Inizia la riproduzione qui - Inizia qui in sottofondo - Inizia qui nel riproduttore a comparsa + Avvia riproduzione in sottofondo + Avvia riproduzione a comparsa Dona Sito web Visita il sito web di NewPipe per maggiori informazioni e novità. @@ -310,10 +310,6 @@ Rientrato Pieno Ingrandito - Dimensione dei caratteri dei sottotitoli - Carattere più piccolo - Carattere normale - Carattere più grande A breve qualcosa apparirà qui ;D Debug Generato automaticamente @@ -324,8 +320,7 @@ Usa la ricerca rapida ma imprecisa La ricerca imprecisa permette al lettore multimediale di spostarsi nelle posizioni più velocemente con una precisione ridotta Metti in coda automaticamente il prossimo flusso - Aggiungi automaticamente un flusso correlato quando è in corso la riproduzione dell\'ultimo flusso in una coda non ripetitiva. - SINCRONIZZAZIONE + Aggiungi automaticamente uno stream correlato raggiunta la fine della coda se la ripetizione è disattivata File Nessuna cartella Nessun file o cartella che contiene sorgenti @@ -367,7 +362,6 @@ Tempo Tono Scollega (può causare distorsione) - Nightcore Valore predefinito Nessun flusso disponibile per il download \'Apri\' preferibilmente con @@ -376,9 +370,9 @@ Modifica la dimensione e gli stili di sfondo dei sottotitoli. Per applicare le modifiche è richesto un riavvio. Nessuna app installata per riprodurre questo file Pulisci cronologia visualizzazioni - Elimina la cronologia dei flussi riprodotti + Elimina la cronologia dei flussi riprodotti e la posizione di riproduzione Elimina l\'intera cronologia delle visualizzazioni\? - Cronologia visualizzazioni eliminata. + Cronologia visualizzazioni eliminata. Pulisci cronologia delle ricerche Cancella la cronologia dei termini di ricerca Elimina l\'intera cronologia delle ricerche\? @@ -420,7 +414,7 @@ Notifiche di aggiornamenti dell\'applicazione Notifiche per una nuova versione di NewPipe Archiviazione esterna non disponibile - Download sulla memoria esterna SD ancora non disponibile. Reimpostare la posizione della cartella di download\? + Impossibile effettuare il download sulla memoria esterna SD. Reimpostare la posizione della cartella di download\? Utilizzando le schede predefinite, c\'è stato un errore durante la lettura delle schede salvate Ripristina predefiniti Davvero ripristinare i predefiniti\? @@ -468,9 +462,49 @@ Ferma Tentativi massimi Tentativi massimi prima di cancellare il download - Metti in pausa quando si usano i dati mobili - I download che non possono essere messi in pausa verranno riavviati + Interrompi con le connessioni a consumo + Utile quando si passa alla connessione dati mobile, altrimenti alcuni download potrebbero essere sospesi Eventi Conferenze Connesione finita + Mostra commenti + Disattiva per non visualizzare i commenti + Riproduzione automatica + + Commenti + + + Nessun commento + Impossibile caricare i commenti + Chiudi + Recupera riproduzione + Recupera l\'ultima posizione di riproduzione + Posizioni nelle liste + Mostra l indicatore di posizione di riproduzione nelle liste + Pulisci dati + Posizione di riproduzione eliminata. + File spostato o cancellato + Esiste già un file con questo nome + impossibile sovrascrivere il file + C\'è un download in corso con questo nome + NewPipe è stato chiuso mentre lavorava sul file + Spazio insufficiente sul dispositivo + Progresso perso poiché il file è stato eliminato + Sei sicuro\? + Un download si avvierà allo stesso tempo + Avvia downloads + Metti in pausa i downloads + Chiedi dove scaricare + Ti sarà chiesto dove salvare i file ogni volta + Utilizza SAF + Limita la coda dei download + Ti verrà chiesto dove salvare ogni download. +\nScegli SAF se vuoi scaricare su una scheda SD esterna + Lo Storage Access Framework permette scaricamenti su una scheda SD esterna. +\nNota: alcuni dispositivi non sono compatibili + Elimina posizioni di riproduzione + Elimina tutte le posizioni di riproduzione + Eliminare tutte le posizioni di riproduzione\? + Cambia le cartelle di download per renderlo effettivo + Attiva/disattiva il servizio, attualmente selezionato: \ No newline at end of file diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index d3d5ea2780c..8057e9f4897 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -13,9 +13,9 @@ 共有 ブラウザを選択 回転 - 動画を保存する場所 - 動画を保存する場所 - 動画を保存する場所を入力して下さい + 動画を保存するフォルダー + ダウンロードした動画をここに保存します + 動画ファイルをダウンロードするフォルダーを選択して下さい デフォルトの解像度 Kodi で再生 Koreが見つかりません｡Kore を入手しますか？ @@ -31,7 +31,7 @@ 動画と音声 %1$s ビュー 動画 プレビュー サムネイル - 動画 プレビュー サムネイル + ビデオ再生、時間: 投稿者アイコンのサムネイル 低評価 高評価 @@ -48,8 +48,8 @@ その他 ネットワークエラー 音声を保存する場所 - ダウンロードした音楽をここに保存します - 音楽ファイルをダウンロードする場所を入力して下さい｡ + ダウンロードした音楽ファイルをここに保存します + 音楽ファイルをダウンロードするフォルダーを選択して下さい 保存場所 \'%1$s\' を作成できません 保存場所 \'%1$s\' を作成しました エラー @@ -57,7 +57,6 @@ 動画のURLを復号できませんでした Webサイトを解析できませんでした コンテンツが利用できません - 保存メニューを設定できませんでした 生放送にはまだ対応していません コンテンツ @@ -100,7 +99,7 @@ タップして詳細を表示 お待ちください… クリップボードにコピーしました - ダウンロードフォルダを選択して下さい + 後ほど設定でダウンロードフォルダを定義してください ダウンロード ダウンロード 不具合報告 @@ -138,8 +137,8 @@ ポップアップ サイズを変更 一部の解像度では音声がありません - プレーヤーのジェスチャー制御 - ジェスチャーを使用してプレーヤーの明るさと音量をコントロールする + プレイヤーのジェスチャー制御 + ジェスチャーを使用してプレイヤーの明るさと音量をコントロールする 検索候補の表示 検索時に候補を表示します 最高の解像度 @@ -153,7 +152,7 @@ このアプリについて 貢献者 ライセンス - Android 向けの自由で軽量なプレイヤー + Android 向けの自由で軽量なストリーミング。 GitHub で表示 NewPipe のライセンス 翻訳、デザインの変更、コードの整理、動作の重いコードの変更など、アイデアをお持ちではありませんか？ヘルプはいつでも歓迎します。より良いものを一緒に作り上げましょう！ @@ -169,11 +168,11 @@ 新着 検索履歴 検索した履歴を記憶します - 再生履歴とキャッシュ + 視聴履歴 再生した履歴を記憶します オーディオフォーカス復帰で再開する 電話などによる中断の後、再生を再開します - プレーヤー + プレイヤー 動画の詳細ページで、背景またはポップアップボタンが押されたときにヒントを表示する 動作 履歴とキャッシュ @@ -236,7 +235,7 @@ 既存の履歴と購読リストは上書きされます 履歴や購読リスト、プレイリストをエクスポートします 再生エラーからの回復中 - 外部プレーヤーは、これらのタイプのリンクをサポートしていません + 外部プレイヤーは、これらのタイプのリンクをサポートしていません 無効なURL エクスポートしました インポートしました @@ -245,12 +244,12 @@ これにより、現在の設定が上書きされます。 バックグラウンド再生 ここから再生を開始 - ここからバックグランド再生を開始 + バックグランドで再生を開始 ドロワーを開く ドロワーを閉じる - 動画プレーヤー - バックグラウンドプレーヤー - ポップアッププレーヤー + 動画プレイヤー + バックグラウンドプレイヤー + ポップアッププレイヤー 情報を取得しています… コンテンツを読み込んでいます 動画ファイルをダウンロード @@ -294,7 +293,6 @@ プレイリストのサムネイルを変更しました。 プレイリストを削除できませんでした。 字幕表示なし - 字幕の文字サイズ インポート/エクスポート インポート インポート元 @@ -311,8 +309,8 @@ バックグラウンド再生の順番待ちに追加 ポップアップ再生の順番待ちに追加 再生履歴を消去 - 再生した動画の履歴を削除します - 再生履歴を削除しました。 + 再生したストリームの履歴と再生位置を削除します + 再生履歴を削除しました。 検索履歴を消去 検索キーワードの履歴を削除します 検索履歴を削除しました。 @@ -338,10 +336,7 @@ 視聴回数 %s 回 - - 本の動画 - - 1 つのアイテムが削除されました + 1 つのアイテムが削除されました。 支援する NewPipe プロジェクトはあなたのプライバシーを非常に大切にしています。あなたの同意がない限り、アプリはいかなるデータも収集しません。NewPipe のプライバシー・ポリシーでは、クラッシュリポート送信時にどのような種類のデータが送信・記録されるかを詳細に説明しています。 NewPipe は著作権が自由のソフトウェアです。あなたは自由にそれを使用し、研究し、そして改善することができます。あなたは、GNU フリーソフトウェア財団が公開する GNU General Public ライセンス バージョン3以降の下に、自由に再配布・修正を行うことができます。 @@ -351,19 +346,19 @@ プレイリスト 「長押しして追加」のヒントを表示する トラック - NewPipe バックグラウンドおよびポップアップのプレーヤーの通知 + NewPipe バックグラウンドおよびポップアップのプレイヤーの通知 新着 & 人気 長押ししてキューに入れる - バックグラウンド再生のキューに入れる - ポップアップ再生のキューに入れる - ポップアップ時にここから開始 + バックグラウンドでキューに入れる + ポップアップでキューに入れる + 新しいポップアップで再生を開始 すぐにここに表示されます;D お好みの \'開く\' アクション コンテンツを開くときのデフォルト動作 — %s フィット 全画面 自動生成 - アプリの再起動後、設定した字幕設定が反映されます + プレーヤーのキャプションテキストの縮尺と背景スタイルを変更します。有効にするには、アプリの再起動が必要です。 何もありません 保存したエクスポートファイルからYouTubeの購読をインポート: \n @@ -376,7 +371,7 @@ 制限なし モバイルデータ使用時の解像度の制限 アプリ切り替え時の最小化 - プレーヤーから他のアプリに切り替え時の動作 — %s + プレイヤーから他のアプリに切り替え時の動作 — %s 何もしない バックグラウンドに変更 ポップアップに変更 @@ -437,8 +432,8 @@ 同じ名前を持つダウンロードが既に進行中です エラーを表示する コード - ファイルを作成できません - 宛先フォルダを作成できません + 宛先のフォルダーを作成できません + ファイルを作成できません 権限がシステムによって拒否されました 安全な接続に失敗しました サーバが見つかりませんでした @@ -453,17 +448,55 @@ 最大再試行回数 ダウンロードを中止するまでの最大再試行回数 音量のジェスチャー制御 - ジェスチャーを使用して、プレーヤーの音量を制御します + ジェスチャーを使用して、プレイヤーの音量を制御します 明るさのジェスチャー制御 - ジェスチャーを使用して、プレーヤーの明るさを制御します + ジェスチャーを使用して、プレイヤーの明るさを制御します ファイルを削除しました アプリの更新通知 - まだ外部 SD カードにダウンロードできません。ダウンロードフォルダーの場所をリセットしますか\? + 外部 SD カードにダウンロードできません。ダウンロードフォルダーの場所をリセットしますか\? デフォルトのタブを使用します。保存されたタブの読み込みエラーが発生しました メインページに表示されるタブ 新しいバージョンが利用可能なときにアプリの更新を確認する通知を表示します ダウンロードから %s の保留中の転送を続行します - モバイルデータ通信に切り替え時に休止 - 休止できないダウンロードが再開されます + 従量制課金ネットワークの割り込み + モバイルデータ通信に切り替える場合に便利ですが、一部のダウンロードは一時停止できません + コメントを表示 + 無効にするとコメントの表示を停止します + 自動再生 + + コメント + + コメントはありません + コメントを読み込めませんでした + 閉じる 接続タイムアウト + 再生を再開 + 最後に再生した位置を復元します + リスト内の位置 + リストに再生位置インジケーターを表示します + データをクリア + 再生位置を削除しました。 + ファイルが移動または削除されました + ファイルを上書きできません + この名前の保留中のダウンロードがあります + ファイルの作業中に NewPipe が閉じられました + デバイスに空き容量がありません + ファイルが削除されたため、進行状況が失われました + よろしいですか\? + ダウンロード キューの制限 + 同時に１つのダウンロードが実行されます + ダウンロードの開始 + ダウンロードの一時停止 + ダウンロード先を尋ねる + ダウンロードのたびに保存する場所を尋ねます + ダウンロードのたびに保存する場所を尋ねられます。 +\n外部 SD カードにダウンロードする場合は SAF を選択してください + SAF を使用する + ストレージアクセスフレームワークは、外部 SD カードへのダウンロードが可能です。 +\n注: 一部のデバイスは互換性がありません + 再生位置の削除 + すべての再生位置を削除します + すべての再生位置を削除しますか\? + ダウンロードフォルダーを変更して有効にします + サービスの切り替え、現在の選択: \ No newline at end of file diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index c6f2b538f54..6cd24123aa7 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -14,9 +14,9 @@ 다음으로 공유 브라우저 선택 회전 - 비디오 다운로드 위치 - 다운로드된 비디오가 저장될 경로를 선택하세요 - 비디오 다운로드 경로 입력 + 비디오 다운로드 폴더 + 다운로드된 비디오 파일이 이 곳에 저장 됩니다 + 비디오 파일을 다운로드 받을 폴더를 선택하세요 기본 해상도 Kodi로 재생 Kore 앱이 발견되지 않았습니다. Kore를 설치할까요? @@ -38,8 +38,8 @@ 외부 비디오 플레이어 사용 외부 오디오 플레이어 사용 오디오 다운로드 폴더 - 다운로드된 오디오는 여기에 저장됩니다 - 오디오 파일 다운로드 경로를 입력하세요 + 다운로드된 오디오 파일은 여기에 저장됩니다 + 오디오 파일을 다운로드할 폴더를 선택하세요 테마 어두운 테마 밝은 테마 @@ -84,7 +84,7 @@ 저장소에 접근할 권한이 거부되었습니다 다운로드 다운로드 - 시작 + 재생 일시정지 삭제 체크섬 @@ -114,7 +114,7 @@ 검색 중에 제안을 표시합니다 검색 기록 검색 기록을 기기에 저장합니다 - 기록 및 캐시 관리 + 기록 보기 시청했던 비디오 기록을 저장 초점 복원시 재생 재개 전화 통화 등으로 인해 재생이 중단된 이후에 다시 재생을 시작합니다 @@ -152,7 +152,6 @@ 무엇을:\\n요청:\\n컨텐츠 언어:\\n서비스:\\nGMT 기준 시간:\\n패키지:\\n버전:\\n안드로이드 버전: 결과 없음 구독할 항목을 추가하세요 - 천 백만 10억 @@ -165,9 +164,6 @@ %s 시청 횟수 비디오 없음 - - 비디오 - 재생 새로운 미션 OK @@ -181,7 +177,7 @@ 터치해서 상세 정보 확인 잠시만 기다려주십시오… 클립보드에 복사됨 - 다운로드 할 폴더를 선택하세요 + 다운로드 할 폴더를 설정에서 지정하십시오 이 권한은 팝업 모드에서 \n열기 위해 필요합니다 로봇인지 확인 (reCAPTCHA) @@ -241,11 +237,11 @@ 상세 정보 오디오 설정 눌러서 대기열에 추가 - 백그라운드로 갈 경우 대기 - 새 팝업으로 갈 경우 대기 + 백그라운드로 갈 경우 재생목록에서 제거 + 새 팝업으로 갈 경우 재생목록에서 제거 여기서부터 재생 - 백그라운드로 갈 경우 여기서부터 재생 - 새 팝업으로 갈 경우 여기서부터 재생 + 백그라운드에서 재생 + 새 팝업에서 재생 스트리밍 플레이어를 찾을 수 없습니다. VLC를 설치하면 플레이하실 수 있습니다. 스트리밍 파일 다운로드하기 정보 보기 @@ -254,11 +250,10 @@ 정확하지는 않지만 빠른 탐색 정확하지 않은 탐색은 빠르게 위치로 탐색할 수 있지만 정확도는 떨어집니다 다음 스트림을 자동으로 재생열에 추가하기 - 이전 스트림이 무한 반복 재생 큐가 아닐 경우, 관련 스트림을 자동 재생합니다. + 이전 스트림이 무한 반복 재생 큐가 아닐 경우, 관련 스트림을 자동 재생합니다 기본 콘텐츠 국가 서비스 디버그 - 라이브 (LIVE) 항상 한번만 디바이스 방향 토글 @@ -316,11 +311,6 @@ 채우기 확대 자동 생성됨 - 자막 폰트 크기 - 작은 폰트 - 보통 폰트 - 큰 폰트 - 동기화 LeakCanary 할성화 힙 덤프 중 메모리 누수 점검으로 앱이 불안정해질 수 있습니다 out-of-lifecycle 오류 보고 @@ -348,11 +338,12 @@ \n3. 다운로드가 곧 시작 됩니다 (이 파일이 구독 파일입니다) SoundCloud 프로필을 가져오시려면 URL 및 ID를 입력해주세요. \n -\n프로필 URL을 찾으시려면 다음 과정을 따라해 주세요. -\n +\n프로필 URL을 찾으시려면 다음 과정을 따라해 주세요. +\n +\n1. 웹 브라우저의 \"데스크톱 모드\" 를 활성화하세요 \n2. 이 주소로 가세요: %1$s \n3. 로그인이 필요하면 하세요. -\n4. 리디렉트된 곳의 URL을 복사하세요. (이 URL이 당신의 프로필 URL 입니다) +\n4. 리디렉트된 프로필 URL을 복사하세요. 프로필ID, soundcloud.com/프로필ID 경고: 데이터 소모량이 늘어날 수 있습니다. \n @@ -368,7 +359,6 @@ 템포 피치 영상과 소리 분리 (소리가 깨질 수 있음) - 나이트코어 기본 다운로드 가능한 스트림이 없습니다 이 파일을 재생할 수 있는 플레이어 앱이 없습니다 @@ -379,9 +369,9 @@ 채널만 재생 목록만 시청 기록 삭제하기 - 동영상 시청 기록을 삭제합니다 + 동영상 시청 기록과 저장된 재생 위치를 삭제합니다 모든 시청 기록을 삭제하시겠습니까\? - 동영상 시청 기록이 삭제되었습니다. + 동영상 시청 기록이 삭제되었습니다. 검색 기록 삭제 검색 기록을 모두 삭제합니다 모든 검색 기록을 삭제하시겠습니까\? @@ -411,9 +401,9 @@ 이벤트 파일 삭제됨 앱 업데이트 알림 - 새 뉴파이프 버전을 알림 + 새 뉴파이프 버전 알림 외부 저장소 없음 - 다운로드할 SD 카드를 찾을 수 없습니다. 다운로드 폴더 경로를 초기화 하시겠습니까\? + SD 카드로 다운로드 할 수 없습니다. 다운로드 폴더 경로를 초기화 하시겠습니까\? 1개의 항목이 삭제되었습니다. 앱 전환시 최소화 비디오 플레이어에서 다른 앱으로 전환 시 다음과 같은 동작 실행 — %s @@ -423,8 +413,8 @@ 단계 초기화 저장된 탭을 읽는 중 오류가 발생하여 기본 탭을 사용합니다 - 기본값 복원 - 기본값을 복원할까요\? + 초기화 + 초기 설정으로 복원하시겠습니까\? 구독자 숫자가 없습니다 메인 화면에 표시할 탭 선택 @@ -449,13 +439,13 @@ %s 다운로드 완료됨 별개의 이름 생성 덮어쓰기 - 이 이름을 가진 파일이 이미 있습니다. - 이 이름을 가진 다운로드 된 파일이 이미 있습니다. + 이 이름을 가진 파일이 이미 있습니다 + 이 이름을 가진 다운로드 된 파일이 이미 있습니다 해당 이름을 가진 다운로드가 이미 진행중입니다 오류 표시 코드 - 파일을 만들 수 없습니다 - 지정한 폴더를 만들 수 없습니다 + 지정한 폴더를 만들 수 없습니다 + 파일을 만들 수 없습니다 시스템에 의해 권한이 거부되었습니다 보안 연결 실패 서버를 찾을 수 없습니다 @@ -470,7 +460,43 @@ 멈추기 최대 재시도 횟수 다운로드를 취소하기 전까지 다시 시도할 최대 횟수 - 모바일 데이터로 전환시 일시정지 - 일시정지 할 수 없는 다운로드의 경우에는 다시 시작됩니다 + 종량제 네트워크에서 일시정지 + 모바일 데이터로 전환될 때, 일부 다운로드는 정지되지 않습니다 컨퍼런스 + 댓글 보기 + 댓글을 보지 않으려면 비활성화하세요 + 자동 재생 + + 댓글 + + 댓글 없음 + 댓글을 불러올 수 없음 + 닫기 + 재생 재개 + 마지막 재생 위치부터 재생 + 리스트내 위치 + 리스트에서 재생위치 인디케이터를 표시합니다 + 데이터 삭제 + 재생위치 삭제완료. + 파일이 이동되거나 삭제되었습니다 + 파일을 덮어쓰기할 수 없습니다 + 해당 이름으로 대기된 다운로드가 있습니다 + 파일 작업 중에 Newpipe가 종료되었습니다 + 남은 저장공간이 없습니다 + 파일이 삭제되어 진행이 중지되었습니다 + 연결시간 초과 + 확실합니까\? + 다운로드 대기 제한 + 다운로드 시작 + 다운로드 일시정지 + 다운로드 위치를 물음 + 다운로드 할때 마다 저장위치를 물을 것 입니다 + SAF 사용 + 스토리지 액세스 프레임워크(SAF)는 외장 SD카드에 다운로드 할 수 있도록 해줍니다. +\n주석: 일부 기기와 호환되지 않을 수 있습니다 + 재생 위치 삭제 + 모든 재생 위치를 삭제 + 모든 재생 위치를 삭제하시겠습니까\? + 매 다운로드 마다 저장경로를 묻습니다. +\n외장 SD카드에 다운로드 하고자 한다면 SAF를 선택하십시오 \ No newline at end of file diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index edb78cc3c82..43fe9d862fe 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -362,10 +362,6 @@ Priartinti Automatiškai sugeneruotas - Antraštės šrifto dydis - Mažesnis šriftas - Normalus šriftas - Didesnis šriftas Įjungti LeakCanary Atminties nutekėjimo stebėjimas gali padaryti programėlę nestabilią diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml index 3d37d6a0fd1..ca17211151f 100644 --- a/app/src/main/res/values-mk/strings.xml +++ b/app/src/main/res/values-mk/strings.xml @@ -368,10 +368,6 @@ Зумирај Автоматски создадено - Големина на преводот - Помал фонт - Нормален фонт - Поголем фонт Вклучи LeakCanary Следењето на мемориските грешки може да ја прикочува апликацијата @@ -414,12 +410,11 @@ Темпо Тон Откачи (може да создаде мутации) - „Nightcore“ Стандардно Избриши историја на гледаност Ја брише историјата на пуштени видеа Избриши ја целата историја на гледаност. - Избришана е историјата на гледаност. + Избришана е историјата на гледаност. Избриши историја на пребарувања Ја брише историјата на пребарувања Избриши ја целата историја на пребарувања. diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml index dcc41f17c62..c7fa5de92b6 100644 --- a/app/src/main/res/values-ms/strings.xml +++ b/app/src/main/res/values-ms/strings.xml @@ -122,9 +122,6 @@ Saluran Senarai main Senarai main - - Video - Trek Pengguna Peristiwa @@ -158,7 +155,7 @@ Hapuskan sejarah tontonan Hapuskan sejarah strim yang telah dimain Padamkan seluruh sejarah tontonan\? - Sejarah tontonan dipadamkan. + Sejarah tontonan dipadamkan. Hapuskan sejarah carian Padamkan sejarah kata kunci carian Padamkan seluruh sejarah carian\? diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index bd225a6bff6..456da27fcad 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -16,15 +16,12 @@ sideoppsett Bruk ekstern videoavspiller Bruk ekstern lydavspiller - Videoens nedlastingssti Mappe lagrede nedlastinger skal puttes i Skriv inn nedlastingssti for videoer - Nedlastingsmappe for lyd Nedlastet lyd lagres her Skriv inn nedlastingssti for lydfiler - Forvalgt oppløsning Spill av med Kodi Kore-programmet ble ikke funnet. Installer det? @@ -35,7 +32,6 @@ Drakt Mørk Lys - Last ned Neste Vis \"Neste\" og \"Lignende\" -videoer @@ -47,7 +43,6 @@ Spiller i bakgrunnen Spill av Nettverksfeil - Video-forhåndsvisning i miniatyrbilde Miniatyrbilde for video-forhåndsvisning Opplasterens avatar @@ -55,7 +50,6 @@ Nesetrekk Bruk Tor (Eksperimentelt) Tving nedlasting av trafikk gjennom Tor for forbedret personvern (strømming av videoer støttes ikke enda). - Kan ikke opprette nedlastingsmappe \'%1$s\' Opprettet nedlastingsmappen \'%1$s\' Trykk for å komme i gang @@ -63,13 +57,13 @@ Spiller en video når NewPipe blir forespurt av et annet program Innhold Aldersbegrenset innhold - Vis aldersbegrenset video. Å tillate slikt materiale kan gjøres fra innstillingene. + Vis aldersbegrenset video. Å tillate slikt materiale kan gjøres via innstillingene. Feil Kunne ikke laste inn alle miniatyrbilder Kunne ikke dekryptere signaturen til videoens nettadresse Kunne ikke tolke nettside Kunne ikke tolke nettside fullstendig - Innholdet er ikke tilgjengelig + Innholdet er utilgjengelig Kunne ikke sette opp nedlastingsmeny Direktesendinger støttes ikke enda. Kunne ikke finne noen strømmer @@ -81,31 +75,23 @@ Hva skjedde: Din kommentar (på Engelsk): Detaljer: - - Rapporter en feil Brukerrapport - Video Audio Prøv igjen Tilgang til lagring nektet - Direkteoverført - + DIREKTE Nedlastinger Nedlastinger Feilrapport - Kunne ikke laste bilde Program/brukergrensesnitt kræsjet Pause Spill Slett Sjekksum - OK - - Filnavn Tråder Feil @@ -119,58 +105,45 @@ Start Nytt mål Feilaktig nettadresse eller manglende internettilknytning - Velg ei tilgjengelig nedlastingsmappe - + Velg nedlastingsmappe senere i innstillingene reCAPTCHA reCAPTCHA-oppgave - Åpne i oppsprettsmodus NewPipe oppsprettsmodus - Forvalgt oppsprettsoppløsning Vis høyere oppløsninger Det er bare noen enheter som støtter avspilling av 2K-/4K-videoer Forvalgt videoformat Svart - Spiller av i oppsprettsmodus Alle Kanal Ja Senere Avskrudd - - - K + k M Mrd. - Denne tilgangen trengs for åpning i oppsprettsmodus - reCAPTCHA-oppgave forespurt - Fjerner lyd ved NOEN oppløsninger Abonner Abonnert Kanalabonnent oppsagt Klarte ikke å endre abonnement Klarte ikke å oppdatere abonnement - Abonnementer - Hva er nytt - Bakgrunn Oppsprett - Husk oppsprettsstørrelse og posisjon Husk siste størrelse og posisjon for oppsprettsvinduet Søkeforslag Vis søkeforslag ved søk Søkehistorikk Lagre søkemønster lokalt - Historikk og mellomlagring + Visningshistorikk Lagre visningshistorikk Oppsprett Filter @@ -178,18 +151,14 @@ Tøm Endrer størrelse Beste oppløsning - NewPipe-merknad Merknad for NewPipe-bakgrunn og oppsprettsspillere - Last ned Tillate tegn i filnavn Ugyldige tegn erstattes av denne verdien Erstatningstegn - Bokstaver og tall De fleste spesialtegn - Om NewPipe Innstillinger Om @@ -211,34 +180,28 @@ Historikk og mellomlagring Spilleliste Angre - Ingen resultater Bare ufisk her - Ingen abonnenter - %s abonnent - %s abonnenter - - + %s abonnent + %s abonnenter + Ingen visninger - %s visning - %s visninger - - + %s visning + %s visninger + Ingen videoer - video - videoer - - + Én video + %s videoer + Vis på GitHub NewPipe sin lisens Hvorvidt du har idéer vedrørende oversettelser, designendringer, koderenskning, eller tunge kodeendringer—hjelp er alltids kjærkommen. Desto mer som gjøres, desto bedre blir det! Les lisensen Bidra - Historikk Søk Sett @@ -247,9 +210,8 @@ Historikken er tom Historikk tømt Element slettet -Ønsker du å slette dette elementet fra søkehistorikken? -Spill av alle - + Ønsker du å slette dette elementet fra søkehistorikken? + Spill av alle Kunne ikke spille av denne strømmen Uopprettelig avspillerfeil oppstod Blank side @@ -258,7 +220,6 @@ Kanalside Velg en kanal Velg en kiosk - Kiosk Topp 50 Nytt og hett @@ -268,24 +229,22 @@ Detaljer Lydinnstillinger Hold for å legge i kø -Vis \"Hold for å legge til\" -tips + Vis \"Hold for å legge til\" -tips Vis tips når bakgrunns- eller oppsårettsknapp trykkes på siden for videodetaljer Lagt i kø for bakgrunnsavspiller Lagt i kø for oppsprettsspiller [Ukjent] - Gjenoppretter fra spillerfeil - Hovedsidens innhold Strømside Abonnerer ikke på noen kanaler enda På vei opp - Legg i kø når henvist til bakgrunnen - Legg i kø ved nytt oppsprett + Legg i kø i bakgrunnen + Legg i kø i nytt oppsprett Start avspilling her - Start her når i bakgrunnen - Start her ved nytt oppsprettsvindu -Doner + Start avspilling i bakgrunnen + Start avspilling i nytt oppsprettsvindu + Doner NewPipe utvikles av frivillige som bruker deres fritid til å gi deg den beste opplevelsen. Gi tilbake for å hjelpe utviklere å gjøre NewPipe enda bedre, mens de nyter en varm kopp kaffe. Bidra Nettside @@ -296,25 +255,21 @@ Bytt til bakgrunnsmodus Bytt til oppsprettsmodus Bytt til hovedmodus - Åpne skuff Lukk skuff Ingen strømmespiller installert (du kan installere VLC for å spille den). Alltid Kun én gang - Eksterne avspillere kan ikke spille lenker av disse typene Ugyldig nettadresse Fant ingen videostrømmer Fant ingen lydstrømmer - Videoavspiller Bakgrunnsavspiller Oppsprettsavspiller - Henter informasjon… Laster forespurt innhold -Importer database + Importer database Eksporter database Overstyrer din nåværende historikk og abonnementsliste Eksporter historikk, abonnementer og spillelister @@ -323,77 +278,55 @@ Ingen gyldig ZIP-fil ADVARSEL: Kunne ikke importere alle filer. Dette vil overskrive ditt nåværende oppsett. - Last ned strøm-fil Vis info - Bokmerkede spillelister - Legg til i - Dra for å omorganisere - Opprett Slett én Slett alle Forkast Gi nytt navn - Ønsker du å slette dette elementet fra oppsynshistorikken? Er du sikker på at du ønsker å slette alle elementene fra historikken? Sist spilt Mest spilt - Alltid spør - Ny spilleliste Slett Gi nytt navn Navn Legg til i spilleliste Sett som miniatyrbilde for spilleliste - Bokmerk spilleliste Fjern bokmerke - Slett denne spillelisten\? Spilleliste opprettet Lagt til i spilleliste Miniatyrbilde for spilleliste endret. Kunne ikke slette spilleliste. - Ingen bildetekster - Tilpass Fyll Forstørr - - Bildetekstens størrelse - Mindre skrift - Normal skrift - Større skrift -Bruk raskt unøyaktig blafring + Bruk raskt unøyaktig blafring Feilretting Fil - Ingen slik mappe Ingen slik fil/innholdskilde Filen finnes ikke eller så har du ikke tilgang til å lese eller skrive til den - Filnavn kan ikke være tomt. + Filnavn kan ikke være tomt En feil inntraff: %1$s - Auto-generert Skru på LeakCanary Importer Importer fra Eksporter til - Importerer… Eksporterer… - Importer fil Forrige eksport - Last miniatyrbilder Bildehurtiglager tømt Tøm hurtiglagret metadata @@ -401,45 +334,34 @@ Metadatahurtiglager tømt Sett neste strøm i kø automatisk Ingen strømmer tilgjengelige for nedlasting - Noe vil bli presentert her snart ;D - - Foretrukket åpningshandling Forvalgt handling ved åpning av innhold — %s - Importer/eksporter din-ID, soundcloud.com/dinid - Husk at denne handlingen kan belaste nettverket tungt. \n \nØnsker du å fortsette? - Fartskontroller for avspilling Tempo Tonehøyde Forvalg -Tøm avspillingshistorikk - Slett historikken for avspilte strømmer + Tøm avspillingshistorikk + Slett historikken og posisjon for avspilte strømmer Slett hele visningshistorikken\? - Visningshistorikk slettet. + Visningshistorikk slettet. Tøm søkehistorikk Sletter historikken for søkte nøkkelord Slett hele søkehistorikken\? Søkehistorikk slettet. Ett element slettet. - Inget program installert for avspilling av denne filen - Undertekster Endre undertekststørrelse og bakgrunnsstiler. Krever omstart av programmet for å tre i effekt. - NewPipe er copyleft, fri programvare: Du kan bruke, studere og forbedre etter egen vilje. Spesifikt kan du redistribuere og/eller modifisere det i henhold til vilkårene gitt i GNU General Public-lisensen, som publisert av Free Software Foundation, enten versjon 3 av lisensen, eller (etter eget ønske) enhver senere versjon. Ønsker du også å importere innstillinger? - Kunne ikke importere abonnementer Kunne ikke eksportere abonnementer - Importer YoutTube-abonnementer ved å laste ned eksportfilen: \n \n1. Gå til denne nettadressen: %1$s @@ -452,14 +374,11 @@ \n4. Kopier profil-nettadressen du ble videresendt til. Unøyaktig blafring tillater spilleren å blafre til posisjoner raskere med redusert nøyaktighet Skru av for å stoppe innlasting av miniatyrbilder, noe som sparer data- og minnebruk. Endring av dette vil tømme både disk- og minne-hurtiglager. - Legg til en relatert strøm ved avspilling av forrige strøm i ikke-repeterende kø. + Legg til en relatert strøm ved avspilling av forrige strøm i ikke-repeterende kø Minnelekkasjeoppsyn kan forårsake programmet å opptre uresponsivt under haugdumping - Rapporter feil som opptrer utenfor sin levetid Tving rapportering av uleverbare Rx-unntak utenom fragment eller aktivitetslevetid etter forkastelse - Avhekt (kan forårsake forvrenging) - Nightcore NewPipes personvernspraksis NewPipe-prosjektet tar ditt personvern veldig alvorlig. Derfor samler ikke programmet inn data uten ditt samtykke. \nNewPipes personvernspraksis forklarer i detalj hvilken deta som sendes og lagres når du sender en kræsjrapport. @@ -468,15 +387,14 @@ \nDu må godta den for å sende oss feilrapporten. Godta Avslå -Ubegrenset + Ubegrenset Begrens oppløsning når mobildata brukes Minimer ved programbytte Handling ved bytting til annet program fra hovedspiller — %s Ingen Minimer til bakgrunnsspiller Minimer til oppsprettsspiller - -Kanaler + Kanaler Spillelister Spor Brukere @@ -496,7 +414,7 @@ Programoppgraderingsmerknad Merknader for nye NewPipe-versjoner Ekstern lagring utilgjengelig - Nedlasting til eksternt SD-kort er ikke mulig enda. Tilbakestill plassering av nedlastingsmappe\? + Nedlasting til eksternt SD-kort er ikke mulig. Tilbakestill plassering av nedlastingsmappe\? Bruker forvalgte faner, feil under lagring av lagrede faner. Gjenopprett forvalg Ønsker du å gjenopprette alt til forvalgene\? @@ -544,6 +462,47 @@ Stopp Maksimalt antall forsøk Maksimalt antall tilkoblingsforsøk før nedlastingen avblåses - Pause ved veksling til mobildata - Nedlastinger som ikke kan pauses vil bli startet på nytt + Pause ved veksling til kvotebasert nett + Nyttig ved veksling til mobildata, selv om noen nedlastinger ikke kan settes på pause + Vis kommentarer + Skru av for å stoppe visning i kommentarer + Spill av automatisk + + Kommentarer + + + Ingen kommenterer + Kunne ikke laste inn kommentarer + Lukk + Venter + Gjenoppta avspilling + Fortsett der du slapp + Posisjon i lister + Vis avspillingsposisjonsindikator i lister + Tøm data + Avspillingsposisjon slettet + Fil flyttet eller slettet + En fil ved dette navnet finnes allerede + Kan ikke overskrive filen + Det finnes en ventende nedlasting ved dette navnet + NewPipe ble lukket under arbeid med filen + Ingen ledig plass på enheten + Framdrift gikk tapt, fordi filen ble slettet + Tilkoblingsavbrudd + Er du sikker\? + Begrens nedlastingskø + Én nedlasting av gangen + Start nedlastinger + Sett nedlastinger på pause + Spør om hvor ting skal lastes ned til + Du vil bli spurt om hvor hver nedlasting skal plasseres + Du vil bli spurt om hvor hver nedlasting skal plasseres. +\nSkru på dette valget hvis du vil laste ned til eksternt SD-kort. + Bruk SAF + Lagringstilgangsrammeverk (SAF) tillater nedlastinger til eksternt SD-kort. +\nMerk: Noen enheter er ikke kompatible. + Slett avspillingsposisjoner + Sletter alle avspillingsposisjoner + Slett alle avspillingsposisjoner\? + Endre nedlastingsmapper for å benytte dette \ No newline at end of file diff --git a/app/src/main/res/values-ne/strings.xml b/app/src/main/res/values-ne/strings.xml new file mode 100644 index 00000000000..2f574dd432a --- /dev/null +++ b/app/src/main/res/values-ne/strings.xml @@ -0,0 +1,30 @@ + + + सुरू गर्न खोज चिन्ह दाब्नुहोस् + %1$s हेराइहरू + %1$s मा प्रकाशित + कुनै स्ट्रिम प्लेयर फेला परेन। के तपाईं VLC इन्स्टल गर्न चाहनुहुन्छ\? + कुनै स्ट्रीम प्लेयर फेला परेन (तपाइँ यसलाई प्ले गर्न VLC इन्स्टल गर्न सक्नुहुन्छ)। + इन्स्टल गर्नुहोस् + रद्द गर्नुहोस् + ब्राउजरमा खाेल्नुहाेस् + पपअप मोडमा खोल्नुहोस् + बांडनुहोस् + डाउनलोड + स्ट्रीम डाउनलोड गर्नुहोस् + खोजी + सेटिङ + के तपाईको मतलब %1$s हो\? + बांडनुहोस् + ब्राउजर रोज्नुहोस् + स्क्रीन रोटेशन + अन्य भिडियो प्लेयर प्रयोग गर्नुहोस् + केही प्रस्तावहरूमा अडियो हटाउँदछ + अन्य अडियो प्लेयर प्रयोग गर्नुहोस् + नयाँ पाइप पपअप मोड + सदस्यता लिनुहोस् + सदस्यता लगिसकेको + सदस्यता रद्द गर्नुहोस् + च्यानल सदस्यता रद्द गरियो + सदस्यता परिवर्तन गर्न सकिएन + \ No newline at end of file diff --git a/app/src/main/res/values-nl-rBE/strings.xml b/app/src/main/res/values-nl-rBE/strings.xml index c9bbd794882..94feb491566 100644 --- a/app/src/main/res/values-nl-rBE/strings.xml +++ b/app/src/main/res/values-nl-rBE/strings.xml @@ -69,7 +69,7 @@ Alle gecachete webpagina-gegevens wissen Metagegevens-cache gewist Volgende stream automatisch in wachtrij plaatsen - Automatisch ne gerelateerde stream toekennen bij het afspelen van de laatste stream in een niet-herhalende wachtlijst. + Automatisch ne gerelateerde stream toekennen bij het afspelen van de laatste stream in een niet-herhalende wachtlijst Veegbesturing Gebruikt vegen voor de helderheid en het volume van de speler aan te passen Zoeksuggesties @@ -203,8 +203,8 @@ Geen video’s - Video - Video’s + %s video + %s video’s Begin Pauzeren @@ -298,11 +298,11 @@ Details Audio-instellingen Houdt ingedrukt voor toe te voegen aan wachtrij - Toevoegen aan wachtrij wanneer op de achtergrond - Toevoegen aan wachtrij bij nieuwe pop-up + Toevoegen aan wachtrij in de achtergrond + Toevoegen aan wachtrij in nieuwe pop-up Begint hier met afspelen - Begint hier met afspelen wanneer op de achtergrond - Begint hier met afspelen in nieuwe pop-up + Begint met afspelen in de achtergrond + Begint met afspelen in nieuwe pop-up Menu openen Menu sluiten Hier zal der binnenkort iets verschijnen ;D @@ -367,12 +367,11 @@ Tempo Toon Ontkoppelen (kan ruis veroorzaken) - Nightcore Standaard Kijkgeschiedenis wissen Verwijdert de geschiedenis van afgespeelde streams De ganse kijkgeschiedenis verwijderen\? - Kijkgeschiedenis verwijderd. + Kijkgeschiedenis verwijderd. Zoekgeschiedenis wissen Verwijdert de gebruikte zoektermen De ganse zoekgeschiedenis verwijderen\? @@ -465,4 +464,14 @@ Maximaal aantal pogingen vooraleer dat den download wordt geannuleerd Pauzeren bij overschakelen naar mobiele gegevens Downloads die dat niet kunnen gepauzeerd worden gaan herstart worden + Commentaren weergeven + Schakelt dit uit voor reacties niet meer weer te geven + Automatisch afspelen + + Commentaren + + + Geen commentaren + Kan commentaren niet laden + Sluiten \ No newline at end of file diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 71719936c9b..f7acba6ae38 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -206,8 +206,8 @@ Geen video\'s - Video - Video’s + %s video + %s video’s Item verwijderd Wil je dit item verwijderen uit je zoekgeschiedenis? @@ -239,11 +239,11 @@ Audio-instellingen Houd ingedrukt om toe te voegen aan wachtrij [Onbekend] - Toevoegen aan wachtrij wanneer in de achtergrond - Toevoegen aan wachtrij bij nieuwe pop-up + Toevoegen aan wachtrij in de achtergrond + Toevoegen aan wachtrij in nieuwe pop-up Begin hier met afspelen - Begin hier met afspelen wanneer op de achtergrond - Begin hier met afspelen in nieuwe pop-up + Begin hier met afspelen in de achtergrond + Begin met afspelen in nieuwe pop-up Doneren NewPipe wordt door vrijwilligers in hun vrije tijd ontwikkeld om jou de beste ervaring te brengen. Geef wat terug zodat onze ontwikkelaars NewPipe nóg beter kunnen maken terwijl ze van hun kopje koffie genieten. Teruggeven @@ -310,10 +310,6 @@ Inpassen Opvullen Inzoomen - Lettergrootte van bijschrift - Kleiner lettertype - Normaal lettertype - Groter lettertype Hier zal binnenkort iets verschijnen ;D Foutopsporing Automatisch gegenereerd @@ -324,8 +320,7 @@ Snelle, minder exact spoelen gebruiken Minder exact spoelen laat de speler sneller posities zoeken met verminderde precisie Volgende stream automatisch in wachtrij plaatsen - Automatisch een gerelateerde stream toekennen bij het afspelen van de laatste stream in een niet-herhalende afspeelwachtlijst. - SYNCHRONISEREN + Automatisch een gerelateerde stream toekennen bij het afspelen van de laatste stream in een niet-herhalende afspeelwachtlijst Bestand Deze map bestaat niet Bestand/Inhoudsbron bestaat niet @@ -367,7 +362,6 @@ Tempo Toon Ontlinken (kan ruis veroorzaken) - Nightcore Standaard Voorkeursactie voor openen Standaardactie bij openen van inhoud — %s @@ -378,7 +372,7 @@ Kijkgeschiedenis wissen Verwijdert de geschiedenis van afgespeelde streams De gehele kijkgeschiedenis wissen\? - Kijkgeschiedenis gewist. + Kijkgeschiedenis gewist. Zoekgeschiedenis wissen Verwijdert de gebruikte zoektermen De gehele zoekgeschiedenis wissen\? @@ -473,4 +467,14 @@ Gebeurtenissen Conferenties Time-out van verbinding + Reacties tonen + Schakel dit uit om reacties niet meer te tonen + Automatisch afspelen + + Reacties + + + Geen reacties + Kan reacties niet laden + Sluiten \ No newline at end of file diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml index c307caead78..c31eb805d3c 100644 --- a/app/src/main/res/values-pa/strings.xml +++ b/app/src/main/res/values-pa/strings.xml @@ -1,31 +1,503 @@ - -ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਸਰਚ ਦਬਾਓ - %1$s ਦੇਖੇ - %1$s ਤੇ ਪਬਲਿਸ਼ ਕੀਤਾ - ਸਟਰੀਮ ਪਲੇਅਰ ਨਹੀਂ ਮਿਲਿਆ . ਤੁਸੀ VLC ਭਰਨਾ ਚਾਹੋਗੇ? - ਸਟਰੀਮ ਪਲੇਅਰ ਨਹੀਂ ਮਿਲਿਆ (ਤੁਸੀਂ vlc ਇੰਸਟਾਲ ਕਰ ਸਕਦੇ ਹੋ) - ਭਰੋ - ਨਹੀਂ - Browser ਚ ਖੋਲੋ - Popup ਚ ਖੋਲੋ - ਭੇਜੋ + + + ਸ਼ੁਰੂ ਕਰਨ ਲਈ ਸਰਚ ਦਬਾਓ + %1$s VIEWS + %1$s ਨੂੰ ਪਬਲਿਸ਼ ਕੀਤੀ ਗਈ + "ਸਟ੍ਰੀਮ ਪਲੇਅਰ ਨਹੀਂ ਮਿਲਿਆ। ਤੁਸੀਂ VLC ਭਰਨਾ ਚਾਹੋਗੇ \?" + ਸਟ੍ਰੀਮ ਪਲੇਅਰ ਨਹੀਂ ਮਿਲਿਆ ਤੁਸੀਂ VLC ਇੰਸਟਾਲ ਕਰ ਸਕਦੇ ਹੋ. + ਇੰਸਟਾਲ + ਰੱਦ ਕਰੋ + ਬ੍ਰਾਊਜ਼ਰ ਵਿੱਚ ਖੋਲੋ + ਪੌਪ-ਅਪ ਵਿਚ ਖੋਲੋ + ਸਾਂਝਾ ਕਰੋ ਡਾਊਨਲੋਡ - ਡਾਊਨਲੋਡ ਸਟਰੀਮ ਫਾਈਲ. + ਡਾਊਨਲੋਡ ਸਟ੍ਰੀਮ ਫਾਈਲ ਖੋਜੋ - ਸੇਟਿੰਗਾਂ + ਸੈਟਿੰਗਾਂ ਕੀ ਤੁਹਾਡਾ ਮਤਲਬ: %1$s\? - ਭੇਜੋ - Browser ਚੁਣੋ - ਉਲਟਾਨਾ - ਹੋਰ ਪਲੇਅਰ ਵਰਤਤੋ - ਕੁਝ ਵੀਡੀਓ ਰੈਸੋਲੂਸ਼ਨ ਚੁਣਨ ਨਾਲ ਆਡੀਓ ਮੌਜੂਦ ਨਹੀਂ ਹੋਵੇਗੀ + ਸਾਂਝਾ ਕਰੋ + ਬ੍ਰਾਊਜ਼ਰ ਚੁਣੋ + ਰੋਟੇਸ਼ਨ + ਹੋਰ ਵੀਡੀਓ ਪਲੇਅਰ ਦੀ ਵਰਤੋਂ ਕਰੋ + ਕੁਝ ਰੇਸੋਲਿਯੁਸ਼ਨ ਤੇ ਆਵਾਜ਼ ਨੂੰ ਹਟਾਉਂਦਾ ਹੈ ਬਾਹਰੀ ਆਡੀਓ ਪਲੇਅਰ ਦੀ ਵਰਤੋਂ ਕਰੋ - NewPipe ਪੋਪਉਪ ਮੋਡ - ਸਅਬਸਕਰਾਇਬ - ਮੈਂਬਰ ਬਣਏ - ਚੈਨਲ ਸਦੱਸਤਾ ਰੱਦ ਕੀਤੀ ਗਈ - ਸਦੱਸਤਾ ਨੂੰ ਬਦਲਣ ਵਿਚ ਅਸਮਰੱਥ ਹੈ - ਜਾਣਕਾਰੀ - + NewPipe ਪੌਪ-ਅਪ ਮੋਡ + ਸਬਸਕ੍ਰਾਈਬ + ਸਬਸਕ੍ਰਾਈਬ ਕੀਤਾ ਹੈ + ਚੈਨਲ ਅਨ-ਸਬਸਕ੍ਰਾਈਬ + ਸਬਸਕ੍ਰਿਪਸ਼ਨ ਨੂੰ ਬਦਲਣ ਵਿਚ ਅਸਮਰੱਥ + ਜਾਣਕਾਰੀ ਵੇਖੋ ਮੁੱਖ - + ਸਬਸਕ੍ਰਿਪਸ਼ਨ ਅੱਪਡੇਟ ਕਰਨ ਵਿਚ ਅਸਮਰੱਥ + ਸਬਸਕ੍ਰਿਪਸ਼ਨ + ਬੁੱਕਮਾਰਕ ਪਲੇਲਿਸਟਾਂ + ਨਵਾਂ ਕੀ ਹੈ + ਬੈਕਗਰਾਊਂਡ + ਪੋਪ-ਅਪ + ਸ਼ਾਮਿਲ ਕਰੋ + ਵੀਡੀਓ ਦਾ ਡਾਊਨਲੋਡ ਮਾਰਗ + ਡਾਉਨਲੋਡ ਕੀਤੇ ਵੀਡੀਓ ਨੂੰ ਸਟੋਰ ਕਰਨ ਦਾ ਮਾਰਗ + ਵੀਡੀਓ ਲਈ ਡਾਊਨਲੋਡ ਮਾਰਗ ਭਰੋ + ਆਡੀਓ ਦਾ ਡਾਊਨਲੋਡ ਫੋਲਡਰ + ਡਾਊਨਲੋਡ ਕੀਤੇ ਆਡੀਓ ਇੱਥੇ ਸਟੋਰ ਹਨ + ਆਡੀਓ ਫਾਈਲਾਂ ਲਈ ਡਾਊਨਲੋਡ ਮਾਰਗ ਭਰੋ + ਆਟੋ ਪਲੇ + ਜਦੋਂ ਕਿਸੇ ਹੋਰ ਐਪ ਜਰੀਏ NewPipe ਨੂੰ ਖੋਲਿਆ ਜਾਂਦਾ ਹੈ ਤਾਂ ਇਹ ਵੀਡੀਓ ਚਲਾਉਂਦਾ ਹੈ + Default Resolution + Default ਪੌਪ-ਅਪ Resolution + ਉੱਚ ਰੇਸੋਲਿਯੁਸ਼ਨਾਂ ਵੀ ਦਿਖਾਓ + ਸਿਰਫ ਕੁੱਝ ਉਪਕਰਣ ਹੀ 2K/4K ਵੀਡੀਓ ਵਿਖਾਉਣ ਵਿਚ ਸਮਰਥਨ ਹੁੰਦੇ ਹਨ + Kodi ਨਾਲ ਚਲਾਓ + Kore ਐਪ ਮੌਜੂਦ ਨਹੀਂ ਹੈ। ਕੀ ਤੁਸੀਂ ਇਸਨੂੰ ਇੰਸਟਾਲ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ \? + \"Kodi ਨਾਲ ਚਲਾਓ\" ਵਿਕਲਪ ਦਿਖਾਓ + Kodi ਮੀਡੀਆ ਸੈਂਟਰ ਰਾਹੀਂ ਵੀਡੀਓ ਚਲਾਉਣ ਲਈ ਇੱਕ ਵਿਕਲਪ ਵਿਖਾਓ + ਆਡੀਓ + Default ਆਡੀਓ ਫਾਰਮੈਟ + "Default ਵੀਡੀਓ ਫਾਰਮੈਟ" + ਥੀਮ + ਸਫੈਦ + ਗੂੜਾ + ਕਾਲਾ + ਪੌਪ-ਅਪ ਦਾ ਆਕਾਰ ਅਤੇ ਸਥਿਤੀ ਯਾਦ ਰੱਖੋ + ਪੌਪ-ਅਪ ਦਾ ਆਖਰੀ ਅਕਾਰ ਅਤੇ ਸਥਿਤੀ ਯਾਦ ਰੱਖੋ + ਤੇਜ਼ ਪਰ inexact seek ਵਰਤੋ + Inexact seek ਵੀਡੀਓ ਨੂੰ ਤੇਜ਼ ਪਰ ਅਣ-ਸਟੀਕ ਢੰਗ ਨਾਲ ਅੱਗੇ-ਪਿੱਛੇ ਲਿਜਾਂਦਾ ਹੈ + ਥੰਬਨੇਲ ਲੋਡ ਕਰੋ + ਥੰਬਨੇਲ ਲੋਡ, ਡਾਟਾ ਦੀ ਬਚਤ ਅਤੇ ਮੈਮੋਰੀ ਦੀ ਵਰਤੋਂ ਨੂੰ ਰੋਕਣ ਲਈ ਇਸਨੂੰ ਬੰਦ ਕਰੋ। ਇਸ ਵਿਚ ਤਬਦੀਲੀ ਕਰਨ ਨਾਲ ਇਨ-ਮੈਮੋਰੀ ਅਤੇ ਆਨ-ਡਿਸਕ ਚਿੱਤਰ cache ਦੋਵੇਂ ਮਿਟ ਜਾਣਗੇ। + ਚਿੱਤਰ cache ਮਿਟਾ ਦਿੱਤੀ ਗਈ ਹੈ + Cached metadata ਮਿਟਾਓ + ਸਾਰੇ cached ਵੈੱਬ-ਪੇਜਾਂ ਦਾ ਡਾਟਾ ਮਿਟਾਓ + Metadata cache ਮਿਟਾ ਦਿੱਤੀ ਗਈ ਹੈ + ਅਗਲੀ ਸਟ੍ਰੀਮ ਨੂੰ ਆਟੋ-ਕਤਾਰਬੱਧ ਕਰੋ + "ਇੱਕ ਨਾ-ਦੁਹਰਾਉਣ ਵਾਲੀ ਕਤਾਰ ਵਿੱਚ ਆਖਰੀ ਸਟ੍ਰੀਮ ਨੂੰ ਚਲਾਉਣ ਵੇਲੇ ਆਪਣੇ-ਆਪ ਸ਼ਾਮਿਲ ਕਰੋ" + ਵੀਡੀਓ ਪਲੇਯਰ gesture ਕੰਟਰੋਲ + ਸਕ੍ਰੀਨ ਲਾਈਟ ਅਤੇ ਆਵਾਜ਼ ਨੂੰ ਕੰਟਰੋਲ ਕਰਨ ਲਈ gestures ਦੀ ਵਰਤੋਂ ਕਰੋ + ਖੋਜ ਸੁਝਾਅ + ਖੋਜ ਕਰਨ ਵੇਲੇ ਸੁਝਾਅ ਦਿਖਾਓ + ਖੋਜ ਸੂਚੀ + ਖੋਜ ਸੂਚੀ ਨੂੰ locally ਸਟੋਰ ਕਰੋ + ਪਹਿਲਾਂ ਤੋਂ ਵੇਖੀਆਂ ਹੋਈਆਂ ਚੀਜ਼ਾਂ ਦੀ ਸੂਚੀ + ਦੇਖੇ ਗਏ ਵਿਡੀਓਜ਼ ਦੀ ਸੂਚੀ ਰੱਖੋ + Focus gain ਹੋਣ ਤੇ ਦੋਬਾਰਾ ਚਲਾਓ + ਰੁਕਾਵਟਾਂ (ਜਿਵੇਂ ਕਿ ਫੋਨ ਕਾਲਾਂ,ਮੈਸੇਜ) ਤੋਂ ਬਾਅਦ ਪਲੇਅ-ਬੈਕ ਜਾਰੀ ਰੱਖੋ + ਡਾਊਨਲੋਡ + ਅੱਗੇ + \'ਅੱਗੇ\' ਅਤੇ \'ਸਮਾਨਅੰਤਰ\' ਵੀਡੀਓ ਦਿਖਾਓ + \"Hold to append\" ਸੁਝਾਅ ਦਿਖਾਓ + ਵੀਡੀਓ ਵੇਰਵੇ ਪੰਨੇ ਤੇ ਬੈਕਗ੍ਰਾਉਂਡ ਜਾਂ ਪੌਪ-ਅਪ ਬਟਨ ਦਬਾਉਣ ਤੇ ਸੰਕੇਤ ਦਿਖਾਓ + ਅਣ-ਸਹਾਇਕ URL + ਮੂਲ ਦੇਸ਼ Content + ਸੇਵਾ + ਪਲੇਯਰ + ਵਿਵਹਾਰ + ਵੀਡੀਓ ਅਤੇ ਆਡੀਓ + ਹਿਸਟਰੀ ਅਤੇ cache + ਪੌਪ-ਅਪ + ਦਿੱਖ + ਹੋਰ + ਡੀ-ਬੱਗ + ਬੈਕਗ੍ਰਾਉਂਡ ਵਿੱਚ ਚੱਲ ਰਿਹਾ ਹੈ + ਪੌਪ-ਅਪ ਮੋਡ ਵਿੱਚ ਚੱਲ ਰਿਹਾ ਹੈ + ਬੈਕਗ੍ਰਾਉਂਡ ਪਲੇਅਰ ਵਿੱਚ ਕਤਾਰਬੱਧ + ਪੌਪ-ਅਪ ਪਲੇਯਰ ਵਿੱਚ ਕਤਾਰਬੱਧ + ਪਲੇ + Content + ਉਮਰ ਪ੍ਰਤੀਬੰਧਿਤ Content + ਉਮਰ ਪ੍ਰਤੀਬੰਧਿਤ ਵੀਡੀਓ ਦਿਖਾਓ ਸੈਟਿੰਗਸ ਤੋਂ ਅਜਿਹੀ ਸਮੱਗਰੀ ਦੀ ਆਗਿਆ ਦੇਣੀ ਸੰਭਵ ਹੈ. + ਲਾਈਵ + ਡਾਊਨਲੋਡਸ + ਡਾਊਨਲੋਡਸ + Error ਰਿਪੋਰਟ + ਸਾਰੇ + ਚੈਨਲ + ਪਲੇ ਸੂਚੀ + ਹਾਂ + ਬਾਅਦ ਵਿੱਚ + ਬੰਦ ਕੀਤਾ + ਫਿਲਟਰ + ਤਾਜ਼ਾ ਕਰੋ + ਮਿਟਾਓ + ਮੁੜ ਆਕਾਰ + ਵਧੀਆ Resolution + ਵਾਪਿਸ + ਸਾਰੇ ਚਲਾਓ + ਹਮੇਸ਼ਾ + ਸਿਰਫ਼ ਇਸ ਬਾਰ + ਫਾਈਲ + NewPipe ਨੋਟੀਫਿਕੇਸ਼ਨ + NewPipe ਬੈਕਗ੍ਰਾਉਂਡ ਅਤੇ ਪੌਪ-ਅਪ ਪਲੇਅਰਾਂ ਲਈ ਸੂਚਨਾਵਾਂ + ਅਣਜਾਣ + Orientation ਬਦਲੋ + ਬੈਕਗਰਾਊਂਡ ਵਿੱਚ ਬਦਲੋ + ਪੌਪ-ਅਪ ਵਿੱਚ ਬਦਲੋ + ਮੁੱਖ ਵਿੱਚ ਬਦਲੋ + Database ਆਯਾਤ ਕਰੋ + Database ਨਿਰਯਾਤ ਕਰੋ + ਤੁਹਾਡੀ ਮੌਜੂਦਾ ਹਿਸਟਰੀ ਅਤੇ ਸਬਸਕ੍ਰਿਪਸ਼ਨਸ ਨੂੰ Override ਕਰਦਾ ਹੈ + ਹਿਸਟਰੀ, ਸੁਬਸਕ੍ਰਿਪਸ਼ਨਸ ਅਤੇ ਪਲੇ-ਸੂਚੀ ਨਿਰਯਾਤ ਕਰੋ + Watch ਹਿਸਟਰੀ ਮਿਟਾਓ + ਚਲਾਈਆਂ ਗਈਆਂ ਸਟ੍ਰੀਮਾਂ ਦੀ ਸੂਚੀ ਮਿਟਾਉਂਦਾ ਹੈ + ਕੀ ਸਾਰੀ watch ਹਿਸਟਰੀ ਮਿਟਾ ਦਿੱਤੀ ਜਾਵੇ \? + ਖੋਜ ਸੂਚੀ ਮਿਟਾਓ + ਖੋਜ ਸ਼ਬਦਾਂ ਦੀ ਸੂਚੀ ਮਿਟਾਉਂਦਾ ਹੈ + ਕੀ ਸਾਰੀ ਖੋਜ ਸੂਚੀ ਮਿਟਾ ਦਿਤੀ ਜਾਵੇ \? + ਖੋਜ ਸੂਚੀ ਮਿਟਾ ਦਿਤੀ ਗਈ ਹੈ. + ERROR + ਨੈੱਟਵਰਕ ERROR + ਸਾਰੇ ਥੰਬਨੇਲ ਲੋਡ ਨਹੀਂ ਹੋ ਸਕੇ + ਵੀਡੀਓ URL ਦਸਤਖਤ ਡੀਕ੍ਰਿਪਟ ਨਹੀਂ ਹੋ ਸਕਿਆ + ਵੈਬਸਾਈਟ parse ਨਹੀਂ ਹੋ ਸਕੀ + ਵੈਬਸਾਈਟ ਪੂਰੀ ਤਰਾਂ Parse ਨਹੀਂ ਹੋ ਸਕੀ + Content ਉਪਲਬਧ ਨਹੀਂ ਹੈ + ਡਾਊਨਲੋਡ ਮੀਨੂੰ ਸੈਟ-ਅਪ ਨਹੀਂ ਹੋ ਸਕਿਆ + ਲਾਈਵ ਸਟ੍ਰੀਮ ਅਜੇ supported ਨਹੀਂ ਹਨ + ਕੋਈ ਸਟ੍ਰੀਮ ਪ੍ਰਾਪਤ ਨਹੀਂ ਹੋ ਸਕੀ + ਚਿੱਤਰ ਲੋਡ ਨਹੀਂ ਹੋ ਸਕਿਆ + ਐਪ/UI crashed + ਇਸ ਸਟ੍ਰੀਮ ਨੂੰ ਚਲਾਇਆ ਨਹੀਂ ਜਾ ਸਕਿਆ + ਅਣਚਾਹਾ ਪਲੇਅਰ ERROR ਆਇਆ ਹੈ + ਪਲੇਅਰ ERROR ਤੋਂ Recover ਹੋ ਰਿਹਾ ਹੈ + External ਪਲੇਅਰ ਇਸ ਕਿਸਮ ਦੇ ਲਿੰਕਾਂ ਦਾ ਸਮਰਥਨ ਨਹੀਂ ਕਰਦੇ + ਅਵੈਧ URL + ਕੋਈ ਵੀ ਵੀਡੀਓ ਸਟ੍ਰੀਮ ਨਹੀਂ ਮਿਲੀ + ਕੋਈ ਵੀ ਆਡੀਓ ਸਟ੍ਰੀਮ ਨਹੀਂ ਮਿਲੀ + ਅਜਿਹਾ ਕੋਈ ਫੋਲਡਰ ਨਹੀਂ + ਅਜਿਹਾ ਕੋਈ ਫਾਈਲ/Content ਸਰੋਤ ਨਹੀਂ ਹੈ + ਫਾਈਲ ਮੌਜੂਦ ਨਹੀਂ ਹੈ ਜਾਂ ਇਸ ਨੂੰ ਪੜ੍ਹਨ ਜਾਂ ਲਿਖਣ ਦੀ ਆਗਿਆ ਨਹੀਂ ਹੈ + ਫਾਈਲ ਨਾਮ ਖਾਲੀ ਨਹੀਂ ਹੋ ਸਕਦਾ + ਇੱਕ ERROR ਆਇਆ ਹੈ: %1$s + ਡਾਊਨਲੋਡ ਕਰਨ ਲਈ ਕੋਈ ਸਟ੍ਰੀਮ ਉਪਲਬਧ ਨਹੀਂ ਹੈ + ਮੁਆਫ ਕਰਨਾ, ਅਜਿਹਾ ਨਹੀਂ ਹੋਣਾ ਚਾਹੀਦਾ ਸੀ. + ਈ-ਮੇਲ ਦੁਆਰਾ ERROR ਦੀ ਰਿਪੋਰਟ ਕਰੋ + ਮੁਆਫ ਕਰਨਾ, ਕੁਝ ERROR ਹੋਏ ਹਨ. + ਰਿਪੋਰਟ + ਜਾਣਕਾਰੀ: + ਕੀ ਹੋਇਆ ਹੈ: + ਕਿਸ ਬਾਰੇ:\\nRequest:\\nContent ਭਾਸ਼ਾ:\\nService:\\nGMT ਸਮਾਂ:\\nPackage:\\nVersion:\\nOS version: + ਤੁਹਾਡੀ ਟਿੱਪਣੀ (ਅੰਗਰੇਜ਼ੀ ਵਿਚ): + ਵੇਰਵੇ: + ਵੀਡੀਓ preview thumbnail + ਵੀਡੀਓ preview thumbnail + ਅਪਲੋਡਰ ਦਾ ਅਵਤਾਰ thumbnail + ਪਸੰਦ + ਨਾਪਸੰਦ + TOR ਦੀ ਵਰਤੋਂ ਕਰੋ + (ਪ੍ਰਯੋਗ ਅਧੀਨ) ਗੋਪਨੀਯਤਾ ਲਈ TOR ਦੁਆਰਾ ਟਰੈਫਿਕ ਨੂੰ ਜਬਰੀ Download ਹੋਣ ਲਈ ਮਜਬੂਰ ਕਰੋ (ਸਟ੍ਰੀਮਿੰਗ ਵੀਡੀਓ ਅਜੇ supported ਨਹੀਂ ਹਨ). + ERROR ਰਿਪੋਰਟ ਕਰੋ + ਯੂਸਰ ਰਿਪੋਰਟ + ਕੋਈ ਨਤੀਜੇ ਨਹੀਂ + ਇਥੇ ਦਾ ਸੁੰਨਾਪਨ ਦੂਰ ਕਰਨ ਲਈ ਕੋਈ ਚੈਨਲ ਸਬਸਕ੍ਰਾਇਬ ਕਰੋ + ਕਤਾਰਬੱਧ ਕਰਨ ਲਈ ਖਿੱਚੋ + ਡਾਊਨਲੋਡ ਡਾਇਰੈਕਟਰੀ ਨਹੀਂ ਬਣਾਈ ਜਾ ਸਕਦੀ \'%1$s\' + ਡਾਊਨਲੋਡ ਡਾਇਰੈਕਟਰੀ ਬਣਾਈ ਗਈ \'%1$s\' + ਵੀਡੀਓ + ਆਡੀਓ + ਦੋਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ + ਸਟੋਰੇਜ਼ Access ਨੂੰ ਅਸਵੀਕਾਰ ਕੀਤਾ ਗਿਆ + ਹਜ਼ਾਰ + ਮਿਲੀਅਨ + ਬਿਲੀਅਨ + ਕੋਈ ਸਬਸਕ੍ਰਾਇਬਰ ਨਹੀਂ + + ਸਬਸਕ੍ਰਾਇਬਰ + ਸਬਸਕ੍ਰਾਇਬਰਸ + + ਕੋਈ views ਨਹੀਂ + + %s view + %s views + + ਕੋਈ ਵੀਡੀਓ ਨਹੀਂ + + %s ਵੀਡੀਓ ਹੈ + %s ਵੀਡੀਓ ਹਨ + + ਸ਼ੁਰੂ ਕਰੋ + ਰੋਕੋ + ਪਲੇ + ਬਣਾਓ + ਮਿਟਾਓ + ਇੱਕ ਮਿਟਾਓ + ਸਾਰਾ ਮਿਟਾਓ + ਚੈੱਕ-ਸਮ + ਬਰਖਾਸਤ ਕਰੋ + ਨਾਮ ਬਦਲੋ + ਨਵਾਂ ਮਿਸ਼ਨ + ਠੀਕ ਹੈ + ਫਾਈਲ ਦਾ ਨਾਮ + threads + ERROR + Unsupported ਸਰਵਰ + ਫਾਈਲ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ + ਖਰਾਬ URL ਜਾਂ ਇੰਟਰਨੈਟ ਉਪਲਬਧ ਨਹੀਂ ਹੈ + NewPipe ਡਾਊਨਲੋਡ ਹੋ ਰਿਹਾ ਹੈ + ਵੇਰਵਿਆਂ ਲਈ ਖੋਲੋ + ਕ੍ਰਿਪਾ ਕਰਕੇ ਉਡੀਕ ਕਰੋ… + ਕਲਿਪ-ਬੋਰਡ ਵਿੱਚ ਕਾਪੀ ਹੋ ਗਿਆ ਹੈ + ਬਾਅਦ ਵਿੱਚ ਸੈਟਿੰਗਾਂ ਵਿਚੋਂ ਇੱਕ ਡਾਉਨਲੋਡ ਫੋਲਡਰ ਨੂੰ ਚੁਣੋ + ਪੌਪ-ਅਪ ਮੋਡ ਵਿੱਚ ਖੋਲ੍ਹਣ ਵਾਸਤੇ ਇਸ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੈ + 1 ਆਈਟਮ ਮਿਟਾਈ ਗਈ. + ReCaptcha + ReCaptcha ਚੁਣੌਤੀ + ReCaptcha ਚੁਣੌਤੀ ਲਈ ਬੇਨਤੀ + ਡਾਊਨਲੋਡ + ਫਾਈਲ ਨਾਮ ਵਿੱਚ ਪ੍ਰਵਾਨਿਤ ਅੱਖਰ + ਗਲਤ ਅੱਖਰ ਇਸ Value ਨਾਲ ਤਬਦੀਲ ਕੀਤੇ ਜਾਣਗੇ + Replacement ਅੱਖਰ + ਅੱਖਰ ਅਤੇ ਅੰਕ + ਬਹੁਤੇ ਖ਼ਾਸ ਅੱਖਰ + ਇਸ ਫਾਈਲ ਨੂੰ ਚਲਾਉਣ ਲਈ ਕੋਈ ਐਪ ਇੰਸਟਾਲ ਨਹੀਂ ਹੈ + NewPipe ਬਾਰੇ + ਸੈਟਿੰਗਾਂ + ਐਪ ਬਾਰੇ + ਥਰਡ-ਪਾਰਟੀ ਲਾਇਸੈਂਸ + © %1$s ਵਲੋਂ %2$s, %3$s ਅਧੀਨ + ਲਾਇਸੈਂਸ ਲੋਡ ਨਹੀਂ ਹੋ ਸਕਿਆ + ਵੈਬਸਾਈਟ ਖੋਲ੍ਹੋ + ਐਪ ਬਾਰੇ + ਯੋਗਦਾਨ ਪਾਉਣ ਵਾਲੇ + ਲਾਇਸੈਂਸ + ਐਂਡਰਾਇਡ ਤੇ ਮੁਫਤ ਲਾਈਟਵੇਟ ਸਟ੍ਰੀਮਿੰਗ. + ਯੋਗਦਾਨ ਪਾਓ + ਭਾਵੇਂ ਤੁਹਾਡੇ ਕੋਲ ਵਿਚਾਰ ਹਨ; ਅਨੁਵਾਦ, ਡਿਜ਼ਾਈਨ ਬਦਲਾਵ, ਕੋਡ ਦੀ ਸਫਾਈ, ਜਾਂ ਅਸਲ ਭਾਰੀ ਕੋਡ ਬਦਲਾਵ — ਹਰ ਮਦਦ ਦਾ ਸਦਾ ਸਵਾਗਤ ਹੈ. ਜਿੰਨਾ ਇਸ ਨੂੰ ਜ਼ਿਆਦਾ ਕੀਤਾ ਜਾਂਦਾ ਹੈ ਉੱਨਾ ਹੀ ਇਹ ਬਿਹਤਰ ਹੁੰਦਾ ਹੈ! + GitHub ਤੇ ਵੇਖੋ + ਦਾਨ ਕਰੋ + NewPipe ਵਲੰਟੀਅਰਾਂ ਦੁਆਰਾ ਵਿਕਸਤ ਕੀਤੀ ਗਈ ਹੈ ਜੋ ਤੁਹਾਡੇ ਲਈ ਬਿਹਤਰ ਅਨੁਭਵ ਲਿਆਉਣ ਲਈ ਸਮਾਂ ਬਿਤਾਉਂਦੇ ਹਨ. ਇੱਕ ਕੱਪ ਕਾਫੀ ਦਾ ਆਨੰਦ ਲੈਂਦੇ ਹੋਏ ਡਿਵੈਲਪਰਾਂ ਨੂੰ NewPipe ਨੂੰ ਹੋਰ ਵਧੀਆ ਬਣਾਉਣ ਵਿੱਚ ਸਹਾਇਤਾ ਲਈ ਵਾਪਸ ਦਿਓ. + ਵਾਪਸ ਦਿਓ + ਵੈਬਸਾਈਟ + ਵਧੇਰੇ ਜਾਣਕਾਰੀ ਅਤੇ ਖ਼ਬਰਾਂ ਲਈ NewPipe ਵੈਬਸਾਈਟ ਵੇਖੋ. + NewPipe\'s ਲਾਇਸੈਂਸ + NewPipe ਇੱਕ ਕਾੱਪੀਲਿਫਟ ਮੁਫ਼ਤ ਸਾੱਫਟਵੇਅਰ ਹੈ: ਤੁਸੀਂ ਇਸ ਦੀ ਵਰਤੋਂ, ਅਧਿਐਨ ਅਤੇ ਇਸ ਨੂੰ ਸਾਂਝਾ ਕਰ ਸਕਦੇ ਹੋ ਅਤੇ ਇਸ ਵਿੱਚ ਆਪਣੀ ਮਰਜ਼ੀ ਅਨੁਸਾਰ ਸੁਧਾਰ ਸਕਦੇ ਹੋ. ਖਾਸ ਤੌਰ \'ਤੇ ਤੁਸੀਂ ਇਸ ਨੂੰ GNU ਜਨਰਲ ਪਬਲਿਕ ਲਾਇਸੈਂਸ ਦੀਆਂ ਸ਼ਰਤਾਂ ਦੇ ਅਧੀਨ ਵੰਡ ਸਕਦੇ ਹੋ / ਜਾਂ ਸੰਸ਼ੋਧਿਤ ਕਰ ਸਕਦੇ ਹੋ ਜਿਵੇਂ ਕਿ ਮੁਫਤ ਸਾੱਫਟਵੇਅਰ ਫਾਊਂਡੇਸ਼ਨ ਦੁਆਰਾ ਪ੍ਰਕਾਸ਼ਤ ਕੀਤਾ ਗਿਆ ਹੈ, ਜਾਂ ਤਾਂ ਲਾਇਸੈਂਸ ਦਾ ਵਰਜ਼ਨ 3, ਜਾਂ (ਤੁਹਾਡੇ ਵਿਕਲਪ\' ਤੇ) ਬਾਅਦ ਦਾ ਕੋਈ ਸੰਸਕਰਣ. + ਲਾਇਸੈਂਸ ਪੜ੍ਹੋ + ਹਿਸਟਰੀ + ਖੋਜਿਆ ਗਿਆ + ਵੇਖਿਆ ਗਿਆ + ਹਿਸਟਰੀ ਬੰਦ ਕੀਤੀ ਹੋਈ ਹੈ + ਹਿਸਟਰੀ + ਹਿਸਟਰੀ ਖ਼ਾਲੀ ਹੈ + ਹਿਸਟਰੀ ਮਿਟਾ ਦਿੱਤੀ ਗਈ ਹੈ + ਆਈਟਮ ਮਿਟਾ ਦਿੱਤੀ ਗਈ ਹੈ + ਕੀ ਤੁਸੀਂ ਇਸ ਚੀਜ਼ ਨੂੰ ਖੋਜ ਸੂਚੀ ਵਿੱਚੋਂ ਮਿਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ\? + ਕੀ ਤੁਸੀਂ ਇਸ ਨੂੰ ਵੇਖੀ ਗਈ ਸੂਚੀ ਵਿੱਚੋਂ ਮਿਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ \? + ਕੀ ਤੁਸੀਂ ਸੱਚਮੁੱਚ ਹਿਸਟਰੀ ਤੋਂ ਸਾਰੀਆਂ ਆਈਟਮਾਂ ਨੂੰ ਮਿਟਾਉਣਾ ਚਾਹੁੰਦੇ ਹੋ\? + ਆਖਰੀ ਚਲਾਈ ਗਈ + ਸਭ ਤੋਂ ਜਿਆਦਾ ਚਲਾਈ ਗਈ + ਮੁੱਖ ਪੰਨੇ ਦੀ ਸਮੱਗਰੀ + ਖਾਲੀ ਪੇਜ + Kiosk ਪੇਜ + ਸਬਸਕ੍ਰਿਪਸ਼ਨ ਪੇਜ + ਫੀਡ ਪੇਜ + ਚੈਨਲ ਪੇਜ + ਚੈਨਲ ਚੁਣੋ + ਅਜੇ ਤੱਕ ਕੋਈ ਚੈਨਲ ਸਬਸਕ੍ਰਿਪਸ਼ਨ ਨਹੀਂ + ਇੱਕ Kiosk ਚੁਣੋ + ਐਕਸਪੋਰਟ ਕੀਤਾ ਗਿਆ + ਇੰਪੋਰਟ ਕੀਤਾ ਗਿਆ + ਕੋਈ ਵੈਧ ZIP ਫਾਈਲ ਨਹੀਂ ਹੈ + ਚੇਤਾਵਨੀ: ਸਾਰੀਆਂ ਫਾਈਲਾਂ ਇੰਪੋਰਟ ਨਹੀਂ ਕੀਤੀਆਂ ਜਾ ਸਕੀਆਂ. + ਇਹ ਤੁਹਾਡੇ ਮੌਜੂਦਾ ਸੈਟ-ਅਪ ਨੂੰ Override ਕਰ ਦੇਵੇਗਾ. + kiosk + ਰੁਝਾਨ ਵਿੱਚ + ਟੌਪ 50 + ਨਵਾਂ ਅਤੇ ਗਰਮਾ-ਗਰਮ + ਬੈਕਗ੍ਰਾਉਂਡ ਪਲੇਅਰ + ਪੌਪ-ਅਪ ਪਲੇਅਰ + ਹਟਾਓ + ਵੇਰਵੇ + ਆਡੀਓ ਸੈਟਿੰਗਾਂ + ਕਤਾਰਬੱਧ ਕਰਨ ਵਾਸਤੇ ਦਬਾ ਕੇ ਰੱਖੋ + ਬੈਕਗ੍ਰਆਊਂਡ ਵਿੱਚ ਕਤਾਰਬੱਧ ਕਰੋ + ਨਵੇਂ ਪੌਪ-ਅਪ ਵਿੱਚ ਕਤਾਰਬੱਧ ਕਰੋ + ਇਥੇ ਚਲਾਉ + "ਬੈਕਗ੍ਰਾਊਂਡ ਵਿੱਚ ਚਲਾਉ" + ਨਵੇਂ ਪੌਪ-ਅਪ ਵਿੱਚ ਚਲਾਓ + Drawer ਖੋਲੋ + Drawer ਬੰਦ ਕਰੋ + ਜਲਦੀ ਹੀ ਇੱਥੇ ਕੁੱਝ ਦਿਖਾਈ ਦੇਵੇਗਾ ;D + ਤਰਜੀਹੀ \'OPEN\' ਐਕਸ਼ਨ + Content ਖੋਲ੍ਹਣ ਵੇਲੇ Default ਕਾਰਵਾਈ — %s + ਵੀਡੀਓ ਪਲੇਅਰ + ਬੈਕਗ੍ਰਾਊਂਡ ਪਲੇਅਰ + ਪੌਪ-ਅਪ ਪਲੇਅਰ + ਹਮੇਸ਼ਾ ਪੁੱਛੋ + ਜਾਣਕਾਰੀ ਪ੍ਰਾਪਤ ਕਰ ਰਹੇ ਹਾਂ… + ਬੇਨਤੀ ਕੀਤਾ Content ਲੋਡ ਕੀਤੀ ਜਾ ਰਿਹਾ ਹੈ + ਨਵੀਂ ਪਲੇ-ਲਿਸਟ + ਮਿਟਾਓ + ਨਾਮ ਬਦਲੋ + ਨਾਮ + ਪਲੇ-ਲਿਸਟ ਵਿੱਚ ਸ਼ਾਮਿਲ ਕਰੋ + ਪਲੇ-ਲਿਸਟ thumbnail ਦੇ ਤੌਰ ਤੇ ਸੈੱਟ ਕਰੋ + ਬੁੱਕਮਾਰਕ ਪਲੇ-ਲਿਸਟ + ਬੁੱਕਮਾਰਕ ਹਟਾਓ + ਇਸ ਪਲੇ-ਲਿਸਟ ਨੂੰ ਮਿਟਾਉਣਾ ਹੈ \? + ਪਲੇ-ਲਿਸਟ ਬਣਾਈ ਗਈ + ਪਲੇ-ਲਿਸਟ ਕੀਤਾ ਗਿਆ + ਪਲੇ-ਲਿਸਟ thumbnail ਬਦਲਿਆ ਗਿਆ. + ਪਲੇ-ਲਿਸਟ ਨੂੰ ਮਿਟਾ ਨਹੀਂ ਸਕੇ. + No captions + ਫਿੱਟ + ਭਰੋ + ਜ਼ੂਮ + Auto-Generated + captions + ਪਲੇਅਰ caption, text ਸਕੇਲ ਅਤੇ ਬੈਕਗ੍ਰਾਉਂਡ ਸਟਾਈਲ ਨੂੰ ਸੋਧੋ. ਪ੍ਰਭਾਵ ਨੂੰ ਲਾਗੂ ਕਰਨ ਲਈ ਐਪ ਨੂੰ ਮੁੜ ਚਾਲੂ ਕਰਨ ਦੀ ਜ਼ਰੂਰਤ ਹੈ. + LeakCanary ਚਲਾਓ + ਮੈਮੋਰੀ ਲੀਕ monitoring, ਐਪ ਨੂੰ Unresponsive ਬਣਾ ਸਕਦੀ ਹੈ ਜਦੋਂ ਹੀਪ dumping ਹੁੰਦੀ ਹੈ + Out-of-lifecycle ERROR ਰਿਪੋਰਟ ਕਰੋ + ਨਿਪਟਾਰੇ ਦੇ ਬਾਅਦ ਟੁਕੜੇ ਜਾਂ ਗਤੀਵਿਧੀਆਂ ਦੇ lifecycle ਤੋਂ ਬਾਹਰ undeliverable Rx ਅਪਵਾਦਾਂ ਬਾਰੇ ਜ਼ਬਰੀ ਰਿਪੋਰਟ ਕਰਨਾ + ਇੰਪੋਰਟ/ਐਕਸਪੋਰਟ + ਇੰਪੋਰਟ + ਇੰਪੋਰਟ ਕਰੋ + ਐਕਸਪੋਰਟ ਕਰੋ + ਇੰਪੋਰਟ ਹੋ ਰਿਹਾ ਹੈ… + ਐਕਸਪੋਰਟ ਹੋ ਰਿਹਾ ਹੈ… + ਇੰਪੋਰਟ ਫਾਈਲ + ਪਿੱਛਲਾ ਐਕਸਪੋਰਟ + ਸਬਸਕ੍ਰਿਪਸ਼ਨਾਂ ਇੰਪੋਰਟ ਨਹੀਂ ਹੋ ਸਕੀਆਂ + ਸਬਸਕ੍ਰਿਪਸ਼ਨਾਂ ਐਕਸਪੋਰਟ ਨਹੀਂ ਹੋ ਸਕੀਆਂ + ਯੂ ਟਿਊਬ ਸਬਸਕ੍ਰਿਪਸ਼ਨਾਂ ਇੰਪੋਰਟ ਕਰਨ ਲਈ ਐਕਸਪੋਰਟ ਫਾਈਲ ਡਾਊਨਲੋਡ ਕਰੋ: +\n +\n1. ਇਸ URL ਤੇ ਜਾਓ: %1$s +\n2. ਆਪਣੇ ਖਾਤੇ ਚ ਲੌਗ-ਇਨ ਕਰੋ +\n3. ਇੱਕ ਡਾਉਨਲੋਡ ਸ਼ੁਰੂ ਹੋਣੀ ਚਾਹੀਦੀ ਹੈ (ਇਹੀ ਐਕਸਪੋਰਟ ਫਾਈਲ ਹੈ) + URL ਜਾਂ ਆਪਣੀ ID ਟਾਈਪ ਕਰਕੇ ਸਾਉੰਡ ਕਲਾਉਡ ਪ੍ਰੋਫਾਈਲ ਇੰਪੋਰਟ ਕਰੋ: +\n +\n1. ਇੱਕ ਵੈਬ-ਬ੍ਰਾਊਜ਼ਰ ਵਿੱਚ \"ਡੈਸਕਟਾਪ ਮੋਡ\" ਨੂੰ ਚਾਲੂ ਕਰੋ (ਸਾਈਟ ਮੋਬਾਈਲ ਉਪਕਰਣਾਂ ਲਈ ਉਪਲਬਧ ਨਹੀਂ ਹੈ) +\n2. ਇਸ URL ਤੇ ਜਾਓ: %1$s +\n3. ਆਪਣੇ ਖਾਤੇ ਚ ਲੌਗ-ਇਨ ਕਰੋ +\n4. ਨਿਰਦੇਸ਼ਤ ਕੀਤੇ ਗਏ ਪ੍ਰੋਫਾਈਲ URL ਨੂੰ ਕਾਪੀ ਕਰੋ. + yourID, Soundcloud.com/yourid + ਯਾਦ ਰੱਖੋ ਕਿ ਇਹ ਕਾਰਜ ਡਾਟਾ consuming ਹੋ ਸਕਦਾ ਹੈ. +\n +\nਕੀ ਤੁਸੀਂ ਜਾਰੀ ਰੱਖਣਾ ਚਾਹੁੰਦੇ ਹੋ\? + ਪਲੇਅਬੈਕ ਸਪੀਡ ਕੰਟਰੋਲ + tempo + pitch + ਅਨਲਿੰਕ (distortion ਪੈਦਾ ਹੋ ਸਕਦੀ ਹੈ) + ਕੀ ਤੁਸੀਂ ਸੈਟਿੰਗਾਂ ਨੂੰ ਵੀ ਇੰਪੋਰਟ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ\? + NewPipe\'s ਗੋਪਨੀਯਤਾ ਨੀਤੀ + NewPipe ਪ੍ਰੋਜੈਕਟ ਤੁਹਾਡੀ ਗੋਪਨੀਯਤਾ ਨੂੰ ਬਹੁਤ ਗੰਭੀਰਤਾ ਨਾਲ ਲੈਂਦਾ ਹੈ. ਇਸ ਲਈ ਐਪ ਤੁਹਾਡੀ ਸਹਿਮਤੀ ਤੋਂ ਬਿਨਾਂ ਕੋਈ ਵੀ ਡਾਟਾ ਇੱਕਠਾ ਨਹੀਂ ਕਰਦਾ. +\nNewPipe ਦੀ ਗੋਪਨੀਯਤਾ ਨੀਤੀ ਵਿਸਥਾਰ ਵਿੱਚ ਦੱਸਦੀ ਹੈ ਕਿ ਜਦੋਂ ਤੁਸੀਂ ਕਰੈਸ਼ ਰਿਪੋਰਟ ਭੇਜਦੇ ਹੋ ਤਾਂ ਕਿਹੜਾ ਡੇਟਾ ਭੇਜਿਆ ਜਾਂ ਸਟੋਰ ਕੀਤਾ ਜਾਂਦਾ ਹੈ. + ਗੋਪਨੀਯਤਾ ਨੀਤੀ ਪੜ੍ਹੋ + ਯੂਰਪੀਅਨ ਜਨਰਲ ਡੇਟਾ ਪ੍ਰੋਟੈਕਸ਼ਨ ਰੈਗੂਲੇਸ਼ਨ (ਜੀਡੀਪੀਆਰ) ਦੀ ਪਾਲਣਾ ਕਰਨ ਲਈ, ਅਸੀਂ ਤੁਹਾਡਾ ਧਿਆਨ NewPipe ਦੀ ਗੋਪਨੀਯਤਾ ਨੀਤੀ ਵੱਲ ਖਿੱਚਦੇ ਹਾਂ. ਕਿਰਪਾ ਕਰਕੇ ਇਸਨੂੰ ਧਿਆਨ ਨਾਲ ਪੜ੍ਹੋ. +\nਸਾਨੂੰ BUG ਰਿਪੋਰਟ ਭੇਜਣ ਲਈ ਤੁਹਾਨੂੰ ਇਸ ਨੂੰ ਸਵੀਕਾਰ ਕਰਨਾ ਪਵੇਗਾ. + ਸਵੀਕਾਰ ਕਰੋ + ਅਸਵੀਕਾਰ + ਕੋਈ ਸੀਮਾ ਨਹੀਂ + ਮੋਬਾਈਲ ਡਾਟਾ ਦੀ ਵਰਤੋਂ ਕਰਦੇ ਸਮੇਂ Resolution ਨੂੰ ਸੀਮਿਤ ਕਰੋ + ਐਪ switch ਕਰਨ ਤੇ minimize ਕਰੋ + ਮੁੱਖ ਵੀਡੀਓ ਪਲੇਅਰ ਤੋਂ ਦੂਜੇ ਐਪ \'ਤੇ ਜਾਣ ਵੇਲੇ ਐਕਸ਼ਨ + ਕੋਈ ਨਹੀਂ + ਬੈਕਗ੍ਰਾਉਂਡ ਪਲੇਅਰ ਵਿੱਚ Minimize ਕਰੋ + ਪੌਪ-ਅਪ ਪਲੇਅਰ ਵਿੱਚ minimize ਕਰੋ + ਚੁੱਪ ਦੌਰਾਨ ਤੇਜ਼ੀ ਨਾਲ ਅੱਗੇ ਕਰੋ + ਸਟੇਪ + ਰੀਸੈੱਟ + ਚੈਨਲਾਂ + ਪਲੇ ਸੂਚੀਆਂ + ਟਰੈਕਸ + ਯੂਜ਼ਰਸ + ਅਨ-ਸਬਸਕ੍ਰਾਈਬ + ਨਵਾਂ ਟੈਬ + ਟੈਬ ਚੁਣੋ + ਆਵਾਜ਼ gesture ਕੰਟਰੋਲ + ਆਵਾਜ਼ ਕੰਟਰੋਲ ਕਰਨ ਲਈ gestures ਦੀ ਵਰਤੋਂ ਕਰੋ + ਸਕ੍ਰੀਨ ਲਾਈਟ gesture ਕੰਟਰੋਲ + ਵੀਡੀਓ ਸਕ੍ਰੀਨ ਲਾਈਟ ਕੰਟਰੋਲ ਕਰਨ ਲਈ gestures ਦੀ ਵਰਤੋਂ ਕਰੋ + ਮੂਲ ਭਾਸ਼ਾ Content + ਅਪਡੇਟਾਂ + ਫਾਈਲ ਮਿਟਾ ਦਿੱਤੀ ਗਈ ਹੈ + ਐਪ ਅੱਪਡੇਟ ਨੋਟੀਫਿਕੇਸ਼ਨ + ਨਵੇਂ NewPipe ਸੰਸਕਰਣ ਲਈ ਸੂਚਨਾਵਾਂ + ਬਾਹਰੀ ਸਟੋਰੇਜ ਉਪਲਬਧ ਨਹੀਂ ਹੈ + ਬਾਹਰੀ SD ਕਾਰਡ ਤੇ ਡਾਊਨਲੋਡ ਕਰਨਾ ਸੰਭਵ ਨਹੀਂ ਹੈ. ਕੀ ਡਾਊਨਲੋਡ ਫੋਲਡਰ ਦੀ ਸਥਿਤੀ ਨੂੰ ਰੀਸੈਟ ਕੀਤਾ ਜਾਵੇ \? + Default ਟੈਬ ਦੀ ਵਰਤੋਂ ਕਰਦਿਆਂ, save ਕੀਤੇ ਟੈਬਾਂ ਨੂੰ ਪੜ੍ਹਨ ਵੇਲੇ ERROR + Default ਮੁੜ-ਪ੍ਰਾਪਤ ਕਰੋ + ਕੀ ਤੁਸੀਂ Default ਲਾਗੂ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ \? + ਸਬਸਕ੍ਰਾਇਬਰਾਂ ਦੀ ਗਿਣਤੀ ਉਪਲਬਧ ਨਹੀਂ ਹੈ + ਮੁੱਖ ਪੰਨੇ ਤੇ ਕਿਹੜੇ ਟੈਬ ਦਿਖਾਏ ਜਾਣਗੇ + ਚੋਣ + ਅਪਡੇਟਾਂ + ਜਦੋਂ ਨਵਾਂ ਸੰਸਕਰਣ ਉਪਲਬਧ ਹੁੰਦਾ ਹੈ ਤਾਂ ਐਪ ਅਪਡੇਟ ਨੂੰ ਪੁੱਛਣ ਲਈ ਇੱਕ ਨੋਟੀਫਿਕੇਸ਼ਨ ਦਿਖਾਓ + ਲਿਸਟ view ਮੋਡ + ਲਿਸਟ + ਗਰਿੱਡ + ਆਟੋ + ਸਵਿੱਚ view + NewPipe ਅੱਪਡੇਟ ਉਪਲਬੱਧ! + ਡਾਊਨਲੋਡ ਕਰਨ ਲਈ ਦਬਾਓ + ਮੁਕੰਮਲ ਹੋਇਆ + ਬਕਾਇਆ + ਰੁਕਿਆ + ਕਤਾਰਬੱਧ + Post-processing + ਕਤਾਰ + ਸਿਸਟਮ ਦੁਆਰਾ ਕਾਰਵਾਈ ਤੋਂ ਇਨਕਾਰ ਕੀਤਾ ਗਿਆ + ਡਾਊਨਲੋਡ ਫੇਲ੍ਹ + ਡਾਊਨਲੋਡ ਮੁਕੰਮਲ + %s ਡਾਊਨਲੋਡ ਮੁਕੰਮਲ + ਵਿਲੱਖਣ ਨਾਮ Generate ਕਰੋ + overwrite + ਇਸ ਨਾਮ ਦੇ ਨਾਲ ਇੱਕ ਡਾਊਨਲੋਡ ਪਹਿਲਾਂ ਤੋਂ ਜਾਰੀ ਹੈ + ERROR ਵਿਖਾਓ + ਕੋਡ + Destination ਫੋਲਡਰ ਬਣਾਇਆ ਨਹੀਂ ਜਾ ਸਕਦਾ + ਫਾਈਲ ਨਹੀਂ ਬਣਾਈ ਜਾ ਸਕਦੀ + ਸਿਸਟਮ ਦੁਆਰਾ permission Deny ਕੀਤੀ ਗਈ + ਸੁਰੱਖਿਅਤ ਕੁਨੈਕਸ਼ਨ ਫੇਲ੍ਹ + ਸਰਵਰ ਨਹੀਂ ਲੱਭ ਸਕਿਆ + ਸਰਵਰ ਨਾਲ ਜੁੜ ਨਹੀਂ ਸਕਦਾ + ਸਰਵਰ ਨੇ ਡਾਟਾ ਨਹੀਂ ਭੇਜਿਆ + ਸਰਵਰ ਮਲਟੀ-Threaded ਡਾਊਨਲੋਡਸ ਨੂੰ ਸਵੀਕਾਰ ਨਹੀਂ ਕਰਦਾ, ਇਸ ਨਾਲ ਦੁਬਾਰਾ ਕੋਸ਼ਿਸ਼ ਕਰੋ @string/msg_threads = 1 + ਬੇਨਤੀ ਕੀਤੀ ਸੀਮਾ ਤਸੱਲੀਬਖਸ਼ ਨਹੀਂ ਹੈ + ਨਹੀਂ ਲਭਿਆ + Post-processing ਫੇਲ੍ਹ + ਮੁਕੰਮਲ ਹੋਈਆਂ ਡਾਊਨਲੋਡ ਸਾਫ਼ ਕਰੋ + ਡਾਉਨਲੋਡਸ ਤੋਂ ਆਪਣੀਆਂ %s ਬਕਾਇਆ ਟ੍ਰਾਂਸਫਰ ਜਾਰੀ ਰੱਖੋ + ਰੁੱਕੋ + ਵੱਧ ਤੋਂ ਵੱਧ ਕੋਸ਼ਿਸ਼ਾਂ + ਡਾਉਨਲੋਡ ਰੱਦ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਵੱਧ ਤੋਂ ਵੱਧ ਕੋਸ਼ਿਸ਼ਾਂ + Metered ਨੈਟਵਰਕਸ ਤੇ ਰੁਕਾਵਟ + ਮੋਬਾਈਲ ਡਾਟਾ ਤੇ switch ਕਰਨ ਵੇਲੇ ਲਾਭਦਾਇਕ ਹੈ, ਹਾਲਾਂਕਿ ਕੁਝ ਡਾਉਨਲੋਡਾਂ ਨੂੰ suspend ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਦਾ + ਇਵੇੰਟਸ + ਕਾਨਫਰੰਸਾਂ + ਟਿੱਪਣੀਆਂ ਦਿਖਾਓ + ਟਿੱਪਣੀਆਂ ਵਿਖਾਉਣਾ ਬੰਦ ਕਰਨ ਲਈ ਇਸਨੂੰ ਬੰਦ ਕਰੋ + ਆਟੋ-ਪਲੇ + + ਟਿਪਣੀਆਂ + + + ਕੋਈ ਟਿੱਪਣੀ ਨਹੀਂ ਕੀਤੀ ਗਈ + ਟਿੱਪਣੀਆਂ ਲੋਡ ਨਹੀਂ ਹੋ ਸਕੀਆਂ + ਬੰਦ ਕਰੋ + ਪਲੇਅਬੈਕ ਦੋਬਾਰਾ ਸ਼ੁਰੂ ਕਰੋ + ਪਿਛਲੀ ਪਲੇਅਬੈਕ ਸਥਿਤੀ ਤੋਂ ਮੁੜ ਚਲਾਓ + ਸੂਚੀਆਂ ਦੀ ਸਥਿਤੀ + ਸੂਚੀਆਂ ਵਿੱਚ ਪਲੇਅਬੈਕ ਸਥਿਤੀ ਸੂਚਕ ਦਿਖਾਓ + ਡਾਟਾ ਮਿਟਾਓ + Watch ਹਿਸਟਰੀ ਮਿਟਾ ਦਿੱਤੀ ਗਈ ਹੈ. + ਪਲੇਬੈਕ ਸਥਿਤੀ ਨੂੰ ਮਿਟਾ ਦਿੱਤਾ ਗਿਆ ਹੈ. + ਫਾਈਲ ਮੂਵ ਕੀਤੀ ਜਾਂ ਮਿਟਾਈ ਗਈ ਹੈ + ਇਸ ਨਾਮ ਵਾਲੀ ਇੱਕ ਫਾਈਲ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ + ਇਸ ਨਾਮ ਨਾਲ ਡਾਉਨਲੋਡ ਕੀਤੀ ਫਾਈਲ ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ + ਫਾਈਲ Overwrite ਨਹੀਂ ਹੋ ਸਕਦੀ + ਇਸ ਨਾਮ ਦੇ ਨਾਲ ਇੱਥੇ ਇੱਕ ਬਕਾਇਆ ਡਾਊਨਲੋਡ ਹੈ + ਫਾਈਲ ਤੇ ਕੰਮ ਕਰਦੇ ਸਮੇਂ NewPipe ਬੰਦ ਕੀਤੀ ਗਈ ਸੀ + ਡਿਵਾਈਸ ਤੇ ਕੋਈ ਜਗ੍ਹਾ ਨਹੀਂ ਬਚੀ ਹੈ + Progress lost, ਕਿਉਂਕਿ ਫਾਈਲ ਮਿਟ ਗਈ ਸੀ + ਕੁਨੈਕਸ਼ਨ timeout + are you sure\? + ਡਾਊਨਲੋਡ ਸੀਮਾ ਕਤਾਰ ਵਿੱਚ + one download will run at the same time + ਡਾਊਨਲੋਡ ਸ਼ੁਰੂ ਕਰੋ + ਡਾਊਨਲੋਡਸ ਰੋਕੋ + ਪੁੱਛੋ ਕਿੱਥੇ ਡਾਊਨਲੋਡ ਕਰਨਾ ਹੈ + ਤੁਹਾਨੂੰ ਪੁੱਛਿਆ ਜਾਵੇਗਾ ਕਿ ਹਰ ਡਾਉਨਲੋਡ ਨੂੰ ਕਿੱਥੇ save ਕਰਨਾ ਹੈ + ਤੁਹਾਨੂੰ ਪੁੱਛਿਆ ਜਾਵੇਗਾ ਕਿ ਹਰ ਡਾਉਨਲੋਡ ਨੂੰ ਕਿੱਥੇ save ਕਰਨਾ ਹੈ. +\nਜੇ ਤੁਸੀਂ ਬਾਹਰੀ SD ਕਾਰਡ ਤੇ ਡਾਊਨਲੋਡ ਕਰਨਾ ਚਾਹੁੰਦੇ ਹੋ ਤਾਂ ਇਸ ਨੂੰ ਚਾਲੂ ਕਰੋ + SAF ਦੀ ਵਰਤੋਂ ਕਰੋ + ਸਟੋਰੇਜ਼ ਐਕਸੈਸ ਫਰੇਮਵਰਕ ਬਾਹਰੀ SD ਕਾਰਡ ਵਿੱਚ ਡਾਊਨਲੋਡ ਕਰਨ ਦੀ ਆਗਿਆ ਦਿੰਦਾ ਹੈ. +\nਨੋਟ: ਕੁਝ ਉਪਕਰਣ ਅਨੁਕੂਲ ਨਹੀਂ ਹਨ + \ No newline at end of file diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 0baad924de1..a899b342e58 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -17,12 +17,12 @@ %1$s wyświetleń Opublikowano %1$s Nie znaleziono odtwarzacza strumieni. Czy chcesz zainstalować VLC\? - Ścieżka pobierania filmów - Ścieżka do przechowywania pobranych filmów - Podaj ścieżkę pobierania filmów + Folder pobierania wideo + Pobrane pliki wideo są przechowywane tutaj + Wybierz folder pobierania plików wideo Ścieżka pobierania dźwięków - Pobrany dźwięk jest przechowywany tutaj - Podaj ścieżkę zapisu dźwięku + Pobrane pliki wideo są przechowywane tutaj + Wybierz folder pobierania plików audio Autoodtwarzanie Odtwórz wideo, kiedy NewPipe zostanie wywołany z innej aplikacji Domyślna rozdzielczość @@ -36,7 +36,7 @@ Ciemny Jasny Pobrane - Następny + Dalej Pokaż \"następne\" i \"podobne\" filmy Nieobsługiwany adres URL Domyślny język treści @@ -101,7 +101,7 @@ Dotknij, aby zobaczyć szczegóły Proszę czekać… Skopiowano do schowka - Proszę wybrać dostępny katalog pobierania + Proszę później zdefiniować katalog pobierania w ustawieniach Nie można załadować obrazu Awaria aplikacji/interfejsu (Eksperymentalne) Wymuś pobieranie przez Tora w celu zwiększenia prywatności (strumieniowe wideo nie jest jeszcze obsługiwane). @@ -172,7 +172,7 @@ Co nowego Historia wyszukiwania Zapisuj lokalnie historię wyszukiwania - Historia i pamięć podręczna + Historia oglądanych Zapisuj historię oglądania Wznów gdy na pierwszym planie Kontynuuj odtwarzanie po przerwaniu (np. po rozmowie telefonicznej) @@ -216,9 +216,9 @@ Brak filmów - film - filmy - filmów + %s film + %s filmy + %s filmów Większość znaków specjalnych Dotacja @@ -248,10 +248,10 @@ Ustawienia dźwięku Przytrzymaj, aby zakolejkować Kolejkuj w tle - Kolejkuj w okienku + Kolejkuj w nowym wyskakującym okienku Zacznij odtwarzać tutaj - Odtwórz w tle - Zacznij tutaj w nowym wyskakującym okienku + Zacznij odtwarzać w tle + Zacznij odtwarzać w nowym wyskakującym okienku Nie znaleziono odtwarzacza strumieniowego (żeby odtworzyć, możesz zainstalować VLC). Domyślny kraj treści Usługa @@ -329,7 +329,7 @@ Wyczyść pamięć podręczną stron Wyczyszczono pamięć podręczną metadanych Automatyczne kolejkowanie następnego strumienia - Automatycznie dodaj kolejny powiązany strumień podczas odtwarzania ostatniego strumienia w niezapętlonej kolejce. + Automatycznie dodaj kolejny powiązany strumień podczas odtwarzania ostatniego strumienia w niezapętlonej kolejce Plik Nie ma takiego folderu Nie ma takiego źródła plików/treści @@ -373,9 +373,9 @@ Napisy Zmodyfikuj skalę tekstu napisów i style tła. Wymaga ponownego uruchomienia aplikacji. Wyczyść historię oglądania - Usuwa historię odtworzonych strumieni + Usuwa historię odtwarzanych strumieni i pozycje odtwarzania Usunąć całą historię oglądania\? - Usunięto historię oglądania. + Usunięto historię oglądania. Wyczyść historię wyszukiwania Usuwa historię wyszukiwania słów kluczowych Usunąć całą historię wyszukiwania\? @@ -417,7 +417,7 @@ Powiadomienie o aktualizacji aplikacji Powiadomienia o nowej wersji NewPipe Pamięć zewnętrzna jest niedostępna - Pobieranie na zewnętrzną kartę SD nie jest jeszcze możliwe. Zresetować lokalizację folderu pobierania\? + Pobieranie na zewnętrzną kartę SD nie jest możliwe. Zresetować lokalizację folderu pobierania\? Korzystanie z domyślnych kart, błąd podczas czytania zapisanych kart Przywróć domyślne Czy chcesz przywrócić ustawienia domyślne\? @@ -464,9 +464,50 @@ Zatrzymaj Maksymalna liczba powtórzeń Maksymalna liczba prób przed anulowaniem pobierania - Przerwij przełączanie na dane mobilne - Pobierane pliki, których nie można wstrzymać, zostaną zrestartowane + Przerwij przy ograniczonym transferze + Pomocne przy przełączaniu na dane mobilne, ale niektóre transfery nie mogą być wstrzymywane Zdarzenia Konferencje Oczekuje + Pokaż komentarze + Wyłącz, aby przestać wyświetlać komentarze + Automatyczne odtwarzanie + + Komentarze + + + + Brak komentarzy + Nie można załadować komentarzy + Zamknij + Wznów odtwarzanie + Przywróć pozycję odtwarzania + Pozycje na liście + Pokaż wskaźniki pozycji odtwarzania na listach + Wyczyść dane + Usunięto pozycję odtwarzania. + Plik przeniesiony lub usunięty + Plik o takiej nazwie już istnieje + Nie można nadpisać tego pliku + Pobieranie pliku z tą nazwą jest już w kolejce + NewPipe został zamknięty w czasie pracy nad plikiem + Brak wystarczającej ilości miejsca na urządzeniu + Utracono postęp ponieważ plik został usunięty + Czy jesteś pewien\? + Ogranicz kolejkę pobierania + Tylko jedno pobieranie będzie realizowane w danej chwili + Rozpocznij pobieranie + Wstrzymaj pobieranie + Zapytaj gdzie pobrać + Będziesz pytany o lokalizację dla każdego pobierania + Połączenie uległo przedawnieniu + Zostaniesz zapytany, gdzie zapisać każde pobranie. +\nWybierz SAF, jeśli chcesz pobrać na zewnętrzną kartę SD + Użyj SAF + Struktura dostępu do pamięci masowej umożliwia pobieranie danych na zewnętrzną kartę SD. +\nUwaga: niektóre urządzenia nie są kompatybilne + Usuń pozycje odtwarzania + Usuwa wszystkie pozycje odtwarzania + Usunąć wszystkie pozycje odtwarzania\? + Zmień foldey pobierania, aby zostały uwzględnione \ No newline at end of file diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 509ab0829c7..109d173b3a3 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -1,26 +1,26 @@ Áudio - Não foi possível descriptografar assinatura de URL do vídeo + Não foi possível descriptografar assinatura de link do vídeo Seu comentário (em inglês): O que aconteceu: Informações: %1$s visualizações Reproduzir - Exibir vídeo com restrições de idade. Permissão para vídeos com essa restrição pode ser dada no menu Configurações. + Mostra vídeo com restrições de idade. Permissão para vídeos com essa restrição pode ser dada no menu Configurações. Vídeo - Reproduz o vídeo quando o NewPipe for aberto a partir de outro aplicativo - Reproduzir automaticamente - Preto + Reproduz um vídeo quando o NewPipe for aberto a partir de outro aplicativo + Reprodução automática + Amoled Cancelar - Soma de Verificação + Checksum Escolher navegador Conteúdo - Conteúdo não disponível - Não foi possível obter nenhuma stream + Conteúdo indisponível + Não foi possível encontrar nenhum vídeo Não foi possível carregar a imagem - Não foi possível carregar todas as miniaturas - Escuro + Não foi possível carregar todas as capas + Noite Formato de áudio padrão Resolução padrão Excluir @@ -38,7 +38,7 @@ Erro Pasta de download criada \'%1$s\' Instalar - Claro + Dia Erro Copiado para a área de transferência Nome do arquivo @@ -56,75 +56,75 @@ Reportar um erro Tentar novamente Rotação - Idioma de conteúdo preferido + Idioma favorito de conteúdo Configurações - Aparência + Interface Outros - Vídeo & Áudio + Vídeo e áudio Compartilhar Compartilhar com Conteúdo com restrição de idade - Exibir \'Próximo\' vídeo e \'Relacionados\' + Mostrar \'Próximo\' e \'Relacionados\' Desculpe, isto não deveria ter acontecido. Iniciar Permissão para acessar armazenamento negada Tema Publicado em %1$s - URL não suportada + Link não suportado pt - ao vivo + AO VIVO Downloads Downloads Você quis dizer: %1$s\? Nova missão - App/interface parou + A interface do aplicativo parou Reproduzindo em segundo plano - Não foi possível preparar o menu de download - Thumbnail do vídeo + Não foi possível configurar o menu de download + Capa do vídeo Miniatura do usuário que enviou o vídeo - Informe o local para download de áudios - Áudios baixados são gravados aqui - Pasta de download de áudio - Informe o local para download de vídeos - Local para salvar vídeos baixados - Local de download de vídeo + Informe a pasta de download de áudios + Pasta para salvar áudios baixados + Pasta para áudios baixados + Informe a pasta de download de vídeos + Pasta para salvar vídeos baixados + Pasta para vídeos baixados Aplicativo Kore não instalado. Instalar? Não foi possível interpretar completamente o site - Miniatura do vídeo - "Transmissões ao vivo ainda não são suportadas " + Capa do vídeo + Transmissões ao vivo ainda não são suportadas Toque em pesquisar para começar Arquivo já existe Threads - URL inválida ou internet indisponível - Selecione uma pasta para download - Nenhum player de stream encontrado. Deseja instalar o VLC? + Link inválido ou internet indisponível + Selecione uma pasta de download posteriormente nas configurações + Nenhum player de vídeo encontrado. Deseja instalar o VLC\? Não foi possível interpretar o site Áudio Reproduzir Reproduzir com Kodi - Buscar - Exibir uma opção para reproduzir o vídeo via centro de mídia Kodi - Usar reprodutor de áudio externo - Usar reprodutor de vídeo externo - (Experimental) Forçar o download de conteúdo através do Tor para maior privacidade (streaming de vídeos ainda não suportado). - Usar Tor + Pesquisar + Mostra opção para reproduzir o vídeo via Kodi + Usar player de áudio externo + Usar player de vídeo externo + (Experimental) Forçar o download de conteúdo através do Tor para maior privacidade (transmissão de vídeos ainda não suportada). + Usar tor Relatório do usuário - Exibir opção \"Reproduzir com Kodi\" - O que:\\nRequisição:\\nIdioma do conteúdo:\\nServiço:\\nHora GMT:\\nPacote:\\nVersão:\\nVersão SO: + Mostrar opção \"Reproduzir com Kodi\" + Ocorrido:\\nRequisição:\\nIdioma do conteúdo:\\nServiço:\\nHora GMT:\\nPacote:\\nVersão:\\nVersão SO: Abrir em modo popup Resolução padrão de popup Mostrar resoluções maiores Apenas alguns dispositivos suportam reprodução de vídeos em 2K/4K - Formato de vídeo preferido + Formato de vídeo padrão Reproduzindo em modo popup Tudo Canal Sim Depois - Desabilitado - K + Desativado + k M - B + G Essa permissão é necessária para abrir em modo popup Modo de popup NewPipe @@ -136,12 +136,12 @@ abrir em modo popup Lembrar tamanho e posição do popup Lembrar do último tamanho e posição definido para o popup Popup - Redimensionamento + Redimensionando Remove o áudio em ALGUMAS resoluções - Controle do player por gestos - Usar gestos para controlar o brilho da tela e volume do player - Sugestões de busca - Mostrar sugestões quando pesquisar + Controle por gestos do player + Use gestos para controlar o volume e o brilho do player + Sugestões de pesquisa + Ative para mostrar sugestões ao pesquisar Melhor resolução Configurações Sobre @@ -149,17 +149,17 @@ abrir em modo popup Não foi possível carregar a licença Abrir site Sobre - Contribuintes + Colaboradores Licenças - Streaming leve e gratuito no Android. + Transmissão leve e livre no Android. Ver no GitHub Licença do NewPipe - Sempre que tiver ideias, traduções, mudanças do design, limpeza de código ou grandes alterações de código, a ajuda é bem vinda. Quanto mais for feito, melhor o aplicativo fica! + Sempre que você tiver ideias, traduções, dicas de design, limpeza de código ou grandes alterações de código, a ajuda é bem vinda. Quanto mais for feito, melhor o aplicativo fica! Ler licença - Contribuir + Colaborar © %1$s %2$s protegido pela licença %3$s Sobre NewPipe - Download + Baixar Caracteres permitidos em nome de arquivos Caracteres inválidos são substituídos por este valor Caractere de substituição @@ -167,29 +167,29 @@ abrir em modo popup Caracteres especiais Inscrever-se Inscrito - Inscrição ao canal cancelada - Não foi possível modificar inscrição + Inscrição de canal cancelada + Não foi possível alterar inscrição Não foi possível atualizar inscrição Principal Inscrições Novidades - Retomar reprodução ao ganhar foco - Continuar reproduzindo depois de interrupções (exemplo: ligações) + Retomar reprodução + Ative para continuar reproduzindo depois de interrupções (por exemplo: ligações) Histórico de pesquisas - Armazenar histórico de pesquisa localmente - Histórico & Cache - Armazenar histórico de vídeos assistidos + Armazena histórico de pesquisas feitas + Histórico de visualizações + Armazena histórico de vídeos assistidos Histórico Pesquisado Assistido - Histórico está desabilitado + Histórico desativado Histórico O histórico está vazio Histórico limpo Notificações do NewPipe - Notificações em plano de fundo para o NewPipe e players em popup + Notificações para o NewPipe em segundo plano e modo popup Comportamento - Histórico e Cache + Histórico e cache Playlist Desfazer Nenhum resultado @@ -203,127 +203,127 @@ abrir em modo popup %s visualização %s visualizações - Nenhum video + Nenhum vídeo - Vídeo - Vídeos + %s vídeo + %s vídeos Item excluído - Reprodutor + Player Não há nada aqui - Deseja apagar este item do seu histórico de busca? + Deseja apagar este item do seu histórico de pesquisas\? Conteúdo - Página em Branco - Página de Quiosque - Página de Inscrição - Página de Atualizações - Página de Canais + Página em branco + Página de banca + Página de inscrição + Página de feed + Página de canais Selecione um canal Nenhuma inscrição ainda - Selecione um quiosque - Quiosque + Selecione uma banca + Banca Em Alta Top 50 Novos e tendências - Mostrar dica \"Mantenha pressionado para enfileirar\" - Exibir dica quando o botão de segundo plano ou de popup for pressionado na página de detalhes do vídeo - Adicionado à fila do reprodutor em segundo plano - Adicionado a fila no reprodutor popup + Mostrar \"Mantenha pressionado para colocar na fila\" + Mostra a dica quando o botão de segundo plano ou de popup for pressionado na página de detalhes do vídeo + Adicionado ao player em segundo plano + Adicionado ao player popup Reproduzir tudo - Não foi possível reproduzir esta stream - Ocorreu um erro no reprodutor - Recuperando erro do reprodutor - Reprodutor de Plano de Fundo - Reprodutor Popup + Não foi possível reproduzir este vídeo + Ocorreu um erro no player + Recuperando-se do erro no player + Player de Plano de Fundo + Player Popup Remover Detalhes - Configurações de Áudio + Configurações de áudio Mantenha pressionado para colocar na fila [Desconhecido] - Adicionar a fila em Plano de Fundo - Adicionar a fila em Popup - Iniciar a reproduzir à partir daqui - Iniciar aqui quando estiver em Plano de Fundo - Iniciar aqui em novo popup + Adicionar à fila em segundo plano + Adicionar à fila em novo popup + Reproduzir daqui + Iniciar a reprodução quando estiver em segundo plano + Reproduzir em novo popup Doar NewPipe é desenvolvido por voluntários que usam seu tempo para trazer a melhor experiência para você. Retribua para ajudar os desenvolvedores a tornarem o NewPipe ainda melhor enquanto desfrutam uma xícara de café. Retribuir Site oficial Visite o site do NewPipe para mais informações e novidades. - Nenhum reprodutor de stream encontrado (você pode instalar o VLC para reproduzir isto). - País do conteúdo padrão + Nenhum player de vídeo encontrado (você pode instalar o VLC para reproduzi-lo). + País favorito de conteúdo Serviço Sempre - Apenas esta vez - Alterar a orientação - Alternar para Segundo Plano - Alterar para Popup - Alterar para o Principal - Reprodutores externos não suportam estes tipos de links - URL inválida - Nenhum stream de vídeo encontrado - Nenhum stream de áudio encontrado - Reprodutor de vídeo - Reprodutor em plano de fundo - Reprodutor popup + Uma vez + Alterar orientação + Alterar para segundo plano + Trocar para popup + Trocar para principal + Players externos não suportam estes tipos de links + Link inválido + Nenhuma transmissão de vídeo encontrada + Nenhuma transmissão de áudio encontrada + Player de vídeo + Player em segundo plano + Player popup Obtendo informações… Carregando o conteúdo requisitado Importar base de dados Exportar base de dados - Sobrescreve seu histórico e inscrições - Exportar histórico, inscrições e listas de reprodução + Sobrescreve seus dados como históricos e inscrições + Exportar históricos, inscrições e playlists Exportado Importado Não há nenhum arquivo ZIP válido - Aviso: Não foi possível importar todos arquivos. + Aviso: Não foi possível importar todos os arquivos. Isso irá sobrescrever suas configurações atuais. - Baixar arquivo de stream + Baixar arquivo Mostrar informações Playlists favoritas Adicionar a Arraste para ordenar Criar - Deletar um - Deletar todos + Excluir um + Excluir todos Dispensar Renomear Deseja apagar este item do seu histórico de visualizações? Tem certeza que deseja apagar todos itens do histórico? Reproduzido anteriormente - Mais vezes reproduzido + Mais reproduzido Sempre perguntar - Nova Lista de Reprodução - Apagar + Nova playlist + Excluir Renomear Nome - Adicionar a Lista de Reprodução - Definir como Miniatura da Lista de Reprodução - Favoritar Lista de Reprodução - Remover Favorito - Deletar esta lista de reprodução\? - Lista de Reprodução criada - Adicionado a lista de reprodução - Miniatura da lista de reprodução alterada. - Falha ao apagar lista de reprodução. - Sem Legendas + Adicionar a playlist + Definir como capa da playlist + Favoritar playlist + Desfavoritar + Excluir esta playlist\? + Playlist criada + Adicionado a playlist + Capa da playlist alterada. + Não foi possível excluir a playlist. + Sem legendas Ajustar Preencher Zoom Algo irá aparecer aqui em breve ;D Gerado automaticamente Habilitar LeakCanary - "Monitoramento de vazamento de memória pode fazer com que o app fique sem responder quando estiver despejando a pilha " - Reportar Erros de Fora do Ciclo de Vida - Forçar o report de exceções Rx não entregáveis ocorrendo fora do fragmento ou ciclo de vida da atividade após o dispose - Usar índice de indexação rápido porém não preciso - Usar índice de indexação inexato - Adicionar a próxima stream à fila automaticamente - Auto anexar uma stream relacionada quando a reprodução iniciar na última stream em uma fila não repetitiva. + O monitoramento de vazamento de memória pode fazer com que o aplicativo fique sem responder ao despejar a pilha + Reportar erros fora do ciclo de vida + Forçar reportagem de exceções Rx não entregáveis ocorrendo fora do fragmento ou ciclo de vida da atividade após o descarte + Usar pesquisa rápida + A pesquisa rápida permite que o player procure resultados mais rapidamente porém com precisão reduzida + Adicionar o próximo vídeo à fila automaticamente + Adicionar automaticamente um vídeo relacionado ao último vídeo reproduzido quando a repetição estiver desativada Arquivo Pasta não encontrada - Origem do arquivo/conteúdo não econtrada - Arquivo não existe ou não há permissão para ler ou escrever nele - Nome do arquivo não pode ser vazio + Origem do arquivo/conteúdo não encontrada + O arquivo não existe ou não há permissão para leitura ou escrita + O nome do arquivo não pode estar vazio Um erro ocorreu: %1$s Importar/Exportar Importar @@ -332,139 +332,185 @@ abrir em modo popup Importando… Exportando… Importar arquivo - Exportação anteriore - Importação de inscrições falhou - Exportação de inscrições falhou - "Importe as inscrições da sua conta no YouTube através do arquivo exportado por ela em: -\n + Exportação anterior + Não foi possível importar inscrições + Não foi possível exportar inscrições + "Importe as inscrições da sua conta no YouTube através do arquivo exportado por ela: +\n +\n +\n \n1. Vá para este link: %1$s -\n2. Faça login quando solicitado -\n3. O download deverá começar (isto é o arquivo exportado)" - Importe uma conta do SoundCloud escrevendo o ID ou a URL no campo abaixo: -\n -\n1. Habilite o \"modo desktop\" em algum navegador da internet (pois essa opção não está disponível para páginas mobile) -\n2. Vá para esta URL: %1$s -\n3. Faça login quando solicitado -\n4. Copie o link no qual você foi redirecionado (este é o link do seu perfil). +\n +\n2. Faça login quando solicitado +\n +\n3. O download do arquivo de exportação iniciará" + Importe uma conta do SoundCloud escrevendo o ID ou o link no campo abaixo: +\n +\n +\n1. Habilite o \"modo desktop\" em algum navegador da internet (a opção está indisponível em página mobile) +\n +\n2. Vá para este link: %1$s +\n +\n3. Entre na sua conta quando solicitado +\n +\n4. Copie o link no qual você foi redirecionado seuID, soundcloud.com/seuid Tenha em mente que esta operação poderá usar bastante a conexão com a internet. \n \nVocê deseja continuar? - Carregar miniaturas - Cache de imagem foi limpo - Limpar o cache de metadados - Remover todos os dados de páginas em cache - Cache de metadados foi limpo - Controles de Velocidade de Reprodução + Carregar capas + Cache de imagens limpo + Limpar metadados em cache + Exclui todos os dados de páginas em cache + Cache de metadados limpo + Controles de velocidade de reprodução "Tempo " - Quando desligado miniaturas não carregarão, economizando uso de dados e memória. Alterar esta configuração irá limpar o cache de imagens na memória e em disco. - Passo + Desative para não carregar capas e economizar em uso de dados e memória. A alteração limpa todo o cache de imagens. + Tom Desvincular (pode causar distorção) - Ação de \'abrir\' preferida - Ação padrão quando abrir conteúdo — %s - Sem fontes disponíveis para download + Ação de \'abrir\' favorita + Ação padrão ao abrir conteúdo — %s + Nenhum vídeo disponível para baixar Abrir gaveta Fechar gaveta Legendas - Modifique o tamanho da legenda e o estilo da tela de fundo. Necessário reiniciar o aplicativo para ter efeito. + Altere o tamanho da legenda e o estilo da tela de fundo. É necessário reiniciar o aplicativo para ter efeito. Nenhum player instalado para reproduzir este arquivo - "Limpar histórico de já assistidos " - Deleta o histórico de videos já reproduzidos - Deletar todo o histórico de já reproduzidos\? - Histórico de já assistidos deletado. - Limpar histórico de pesquisa - Deleta histórico de palavras chave pesquisadas - Deletar todo o histórico de pesquisa\? - Histórico de pesquisa deletado. - 1 item deletado. + Limpar histórico de reproduções + Apaga o histórico de vídeos assistidos e a lista de reprodução + Apagar todo o histórico de reproduções\? + Histórico de reproduções limpo. + Limpar histórico de pesquisas + Apaga o histórico de pesquisas feitas + Apagar todo o histórico de pesquisas\? + Histórico de pesquisas limpo. + 1 item excluído. NewPipe é software livre copyleft: Você pode usar, estudar, compartilhar e melhorar ele a vontade. Mais especificamente você pode redistribuir e/ou modificar ele sob os termos da GNU General Public License como publicada pela Free Software Foundation, tanto a versão 3 dessa Licença, ou (a sua escolha) qualquer outra versão posterior. Você também quer importar as configurações? Política de privacidade do NewPipe - O projeto NewPipe leva a sua privacidade muito a sério. Sendo assim, o aplicativo não coleta nenhum dado sem seu consentimento. -\nA polícia de privacidade do NewPipe explica em detalhes qual dado é enviado e salvo quando você envia um relatório de erros. + O projeto NewPipe leva a sua privacidade muito a sério. Sendo assim, o aplicativo não coleta nenhum dado sem seu consentimento. +\nA política de privacidade do NewPipe explica em detalhes qual dado é enviado e salvo quando você envia um relatório de erros. Ler a política de privacidade - A fim de cumprir com o European General Data Protection Regulation (GDPR), em português, Regulamento Geral sobre a Proteção de Dados (RGPD), chamamos sua atenção para a política de privacidade do NewPipe. Por vafor, leia-a cuidadosamente. -\nVocê tem que aceitá-la para nos enviar relatório de erros. + A fim de cumprir com o European General Data Protection Regulation (GDPR), em português, Regulamento Geral sobre a Proteção de Dados (RGPD), chamamos sua atenção para a política de privacidade do NewPipe. Por favor, leia-a cuidadosamente. +\nVocê deve aceitá-la para nos enviar relatório de erros. Aceitar Recusar Ilimitado - Limitar resolução quando dados móveis estiverem em uso + Limitar resolução em dados móveis Minimizar ao trocar de aplicativo - Ação ao trocar de aplicativo quando estiver no reprodutor de vídeo principal — %s - "Nenhuma " - Minimizar para reprodutor em plano de fundo - Minimizar para reprodutor popup + Ação ao trocar de aplicativo quando estiver no player principal — %s + Nenhuma + Minimizar para player em segundo plano + Minimizar para player popup Avançar rapidamente durante silêncio - Parar -\n + Passo Reiniciar Canais - Listas de reprodução + Playlists Faixas Usuários Cancelar inscrição - Nova Aba + Nova aba Selecionar aba - Gesto de controle do volume - Usar gestos para controlar o volume do reprodutor - Gesto para controle do brilho - Usar gestos para controlar o brilho do reprodutor - Debugar + Gestos para volume + Use gestos para controlar o volume do player + Gestos para brilho + Use gestos para controlar o brilho do player + Depuração Atualizações Eventos - Arquivo apagado - Notificação de Atualização do Aplicativo - Notificações para a versão do NewPipe + Arquivo excluído + Notificação de atualização do aplicativo + Notificações para nova versão do NewPipe Armazenamento externo indisponível - Baixar para o cartão SD externo ainda não é possivel. Resetar o local da pasta de download\? - Usando abas padrão, erro ao ler abas salvas + Não foi possível baixar para o cartão SD externo. Redefinir a pasta de download\? + Usando abas padrões, erro ao ler abas salvas Restaurar padrões Deseja restaurar os padrões\? - Contagem de inscritos não disponível + Número de inscritos indisponível Abas que são mostradas na página principal Seleção Conferências Atualizações - Mostrar uma notificação para solicitar atualização do aplicativo quando uma nova versão estiver disponível - Modo de visualização em lista + Mostrar notificação para atualizar aplicativo quando uma nova versão estiver disponível + Modo de visualização Lista Grade Automático Alterar visualização - Atualização do NewPipe Disponivel! + Atualização do NewPipe Disponível! Toque para baixar Finalizado pausado adicionado na fila - pós processamento + pós-processamento Fila Ação negada pelo sistema - Falha ao baixar + Erro ao baixar Download finalizado %s downloads terminados Gerar nome único "Sobrescrever " Um arquivo baixado com esse nome já existe - Existe um download em progresso com esse nome + Existe um download em progresso com este nome Mostrar erro Código O arquivo não pode ser criado - A pasta de destino não pode ser criada + Não foi possível criar a pasta de destino Permissão negada pelo sistema - "Falha na conexão segura " + Falha na conexão segura Não foi possível encontrar o servidor Não foi possível conectar ao servidor O servidor não envia dados - "O servidor não aceita downloads em multi-thread, tente com @string/msg_threads = 1 " + O servidor não aceita downloads em multi-thread, tente com @string/msg_threads = 1 Intervalo solicitado não aceito Não encontrado Falha no pós processamento Limpar downloads finalizados Continuar seus %s downloads pendentes Parar - Tentativas máximas + Tentativas Máximas Número máximo de tentativas antes de cancelar o download Pausar quando trocar para dados móveis - Downloads que não puderem ser pausados serão reiniciados + Útil ao trocar para dados móveis, porém alguns downloads não podem ser suspensos Pendente + Mostrar comentários + Desative para ocultar comentários + Reprodução automática + + Comentário + Comentários + + Sem comentários + Não foi possível carregar os comentários + Fechar + Retomar a reprodução + Retorna para a última posição em reprodução + Posições em listas + Mostrar indicadores de posição em listas + Limpar dados + Posições de reprodução apagadas. + Arquivo movido ou excluído + Já existe um arquivo com este nome + Não foi possível sobrescrever o arquivo + Existe um download pendente com este nome + NewPipe foi fechado enquanto manipulava o arquivo + Não há espaço disponível no dispositivo + Progresso perdido devido ao arquivo ter sido apagado + Tempo limite de conexão + Tem certeza\? + Limitar tamanho da fila de download + Um download será executado ao mesmo tempo + Iniciar downloads + Pausar downloads + Perguntar onde salvar o arquivo + Você será questionado onde salvar o arquivo a cada download + Você será questionado onde salvar o arquivo a cada download +\nAtive esta opção caso queira fazer o download para um cartão de memória SD externo + Usar SAF + A Estrutura de Acesso ao Armazenamento permite baixar para um cartão SD. +\nAviso: alguns dispositivos não são compatíveis + Apagar lista de reprodução + Deletar todo o histórico de reprodução + Deletar todo o histórico de reprodução\? \ No newline at end of file diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 77819197764..8a1a3bcc4e0 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -7,36 +7,36 @@ Cancelar Abrir no navegador Partilhar - Descarregar + Transferir Pesquisar Definições - Será que queria dizer: %1$s? + Quis dizer: %1$s\? Partilhar com Escolher navegador rotação - Utilizar reprodutor de vídeo externo + Usar reprodutor de vídeo externo Utilizar reprodutor de áudio externo - Local para a descarga de vídeos - Local para guardar os vídeos descarregados - Digite o caminho para os vídeos - Resolução padrão + "Pasta para descarregar o vídeo" + Os ficheiros de vídeo descarregados são armazenados aqui + Escolha a pasta de descarregamento para ficheiros de vídeo + Resolução predefinida Reproduzir no Kodi Aplicação Kore não encontrada. Instalar? Mostrar opção \"Reproduzir no Kodi\" - Mostra uma opção para reproduzir o vídeo no Kodi + Exibe uma opção para reproduzir o vídeo no Kodi Áudio - Formato áudio padrão - Descarregar + Formato de áudio predefinido + Transferir Seguinte Mostrar vídeos \'Seguintes\' e \'Semelhantes\' URL não suportado - Idioma padrão do conteúdo + Idioma do conteúdo predefinido Vídeo e áudio - Miniatura de vídeos - Miniatura de vídeos - Miniatura da foto do canal - Não gosto - Gosto + Miniatura de pré-visualização de vídeo + Miniatura de pré-visualização de vídeo + Miniatura do avatar do canal + Não gostar + Gostos Tema Escuro Claro @@ -46,50 +46,49 @@ Reproduzir Erro de rede Usar Tor - (Experimental) Usar a rede Tor para aumentar a privacidade (ainda não é suportada a emissão de vídeos). - Pasta para a descarga de áudio - Local para guardar o áudio descarregado - Digite o caminho para os ficheiros de áudio - Não foi possível criar o diretório \'%1$s\' - Diretório \'%1$s\' criado com sucesso + (Experimental) Forçar o tráfego de transferência via Tor para aumentar a privacidade (ainda não é suportada a emissão de vídeos). + Pasta de transferências de áudio + Ficheiros de áudio descarregados são armazenados aqui + Escolha a pasta de descarregamento para ficheiros de áudio + Não é possível criar a diretoria \'%1$s\' + Criada a diretoria de transferência \'%1$s\' Erro - Incapaz de carregar todas as miniaturas - Incapaz de descodificar a assinatura do vídeo - Incapaz de processar o site - Conteúdo não disponível - + Não foi possível carregar todas as miniaturas + Não foi possível desencriptar a assinatura do URL do vídeo + Não foi possível analisar o site da Web + Conteúdo indisponível Conteúdo - Restringir conteúdo por idade - Mostrar vídeo com restrição de idade. É possível permitir tal material nas Configurações. - Não foi possível processar totalmente o site - Não foi possível configurar o menu de descargas + Conteúdo com restrição de idade + Mostrar vídeo com restrição de idade. É possível permitir tal material nas Definições. + Não foi possível processar totalmente o site da Web + Não foi possível configurar o menu de transferências As emissões em direto ainda não são suportadas Não foi possível obter a emissão - Desculpe mas isto não deveria ter acontecido. + Desculpe, isso não deveria ter acontecido. Reportar erro por e-mail - Ocorreram alguns erros. + Desculpe, ocorreram alguns erros. Relatório - Info: + Informação: O que ocorreu: Comentários (em inglês): Detalhes: Vídeo Áudio Tentar novamente - A permissão para aceder ao armazenamento foi recusada + Negada a permissão para aceder ao armazenamento Toque para iniciar a pesquisa Reprodução automática Reproduzir vídeo se o NewPipe for invocado por outra aplicação Direto Reportar um erro Relatório - Descargas - Descargas + Transferências + Transferências Relatório de erro Iniciar Pausa Reproduzir - Apagar + Eliminar Checksum Nova missão Nome do ficheiro @@ -98,16 +97,16 @@ Ficheiro já existe URL inválido ou Internet não disponível Toque para detalhes - Por favor aguarde… + Por favor, aguarde… Copiado para a área de transferência - Por favor selecione a pasta para as descargas + Por favor, defina mais tarde uma pasta de transferências nas definições OK Processos - Descarga do NewPipe + Transferência do NewPipe Não foi possível carregar a imagem - Aplicação encerrada + Aplicação/IU crachou O quê:\\nPedido:\\nIdioma do conteúdo:\\nServiço:\\nHora GMT:\\nPacote:\\nVersão:\\nVersão do SO: - Abrir no modo \"popup\" + Abrir no modo de janela autónoma Preto Tudo Canais @@ -115,28 +114,28 @@ Depois K M - MM + B Esta permissão é necessária -\npara o modo \'popup\' +\npara o modo de janela reCAPTCHA Desafio reCAPTCHA Desafio reCAPTCHA solicitado - Modo \'popup\' do NewPipe - Reproduzir em modo \"popup\" - Formato de vídeo padrão + Modo de janela autónoma do NewPipe + Reproduzir no modo de janela autónoma + Formato de vídeo predefinido Desativado - Resolução padrão do \'popup\' + Resolução da janela autónoma predefinida Mostrar resoluções mais altas - Apenas alguns dispositivos possuem suporte a vídeos 2K/4K - Popup - Lembrar tamanho e posição do \'popup\' - Popup + Apenas alguns dispositivos suportam a reprodução de vídeos em 2K/4K + Janela + Lembrar tamanho e posição da janela + Janela Filtrar - Recarregar + Atualizar Limpar Segundo plano Remove o áudio em algumas resoluções - Lembrar último tamanho e posição do \'popup\' + Lembrar último tamanho e posição da janela Redimensionar Controlo de reprodução por gestos Utilizar gestos para controlar o brilho e o volume do reprodutor @@ -150,35 +149,35 @@ © %1$s de %2$s nos termos da %3$s Não foi possível carregar a licença Abrir site - Acerca + Sobre Colaboradores Licenças - Aplicação de reprodução de emissões para sistemas Android. + Aplicação de reprodução de emissões livre para Android. Ver no GitHub Licença do NewPipe - Se tem ideias para: tradução, alterações de design, limpeza de código ou alterações ao código fonte - todas as ajudas são bem-vindas. Quanto mais se faz, melhor ficará! + Se tem ideias para: tradução, alterações de desenho, limpeza de código, ou alterações significativas no código fonte - todas as ajudas são bem-vindas. Quanto mais se faz, melhor ficará! Ler licença Participar Subscrever Subscrito Canal não subscrito - Incapaz de alterar a subscrição - Incapaz de atualizar a subscrição + Não foi possível alterar a subscrição + Não foi possível atualizar a subscrição Principal Subscrições Novidades Histórico de pesquisa Guardar termos de pesquisa localmente - Histórico e cache - Guardar histórico de vídeos assistidos + Ver histórico + Manter histórico dos vídeos vistos Retomar ao ganhar foco Continuar reprodução após interrupções (ex. chamadas) Reprodutor Comportamento Histórico e cache Lista de reprodução - Desfazer - Notificação NewPipe + Anular + Notificação do NewPipe Notificações para o NewPipe e para os reprodutores \"popup\" Sem resultados Aqui não há nada para ver @@ -194,24 +193,24 @@ Sem vídeos - vídeo - vídeos + %s vídeo + %s vídeos - Descarregar - Caracteres permitidos em nomes de ficheiros - Caracteres inválidos são substituídos por este valor - Carácter de substituição + Transferir + Carateres permitidos nos nomes de ficheiros + Os carateres inválidos são substituídos por este valor + Caráter de substituição Letras e dígitos - Caracteres especiais + Os carateres mais especiais Histórico Pesquisado Visualizado - Histórico desativado + O histórico está desativado Histórico O histórico está vazio - Histórico apagado - Item apagado - Deseja apagar este item do histórico de pesquisa? + Histórico limpo + Item eliminado + Deseja eliminar este item do histórico de pesquisas\? Reproduzir todos [Desconhecido] Ocorreu um erro irrecuperável do reprodutor @@ -233,88 +232,88 @@ Detalhes Definições de áudio Iniciar reprodução aqui - Iniciar aqui se em segundo plano - Iniciar aqui em novo \'pop-up\' + Iniciar reprodução em segundo plano + Iniciar reprodução numa nova janela Mostrar informação Listas de reprodução favoritas Serviço Sempre Apenas uma vez - Mudar orientação + Alternar orientação Importar base de dados Exportar base de dados Substitui o histórico e as subscrições atuais Exportar histórico, subscrições e listas de reprodução Em lista de espera no reprodutor em segundo plano - Em lista de espera no reprodutor popup + Em fila no reprodutor de janela autónoma Mudar para segundo plano Mudar para \'popup\' Mudar para principal Incapaz de reproduzir este vídeo - Reprodutores externos não suportam este tipo de ligações + Os reprodutores externos não suportam este tipo de hiperligações URL inválido Arraste para reordenar Criar - Apagar um - Apagar todos + Eliminar um + Eliminar todos Renomear Doar - Nenhum reprodutor encontrado (pode instalar o reprodutor VLC). - Descarregar ficheiro da emissão + Não foi encontrado nenhum reprodutor (pode instalar o VLC para reproduzir). + Transferir ficheiro de emissão Adicionar a Utilizar pesquisa rápida Esta opção permite que a pesquisa seja mais rápida mas diminui a qualidade da precisão Carregar miniaturas - Desative para parar o carregamento das miniaturas e poupar dados e memória. Se alterar esta opção limpa a cache de memória e do disco. + Desative para parar o carregamento das miniaturas, poupar dados e utilização da memória. As alterações limpam a cache de imagem do disco e da memória. Cache de imagens limpa - País padrão para o conteúdo + País do conteúdo predefinido Depuração Não foram encontradas emissões de vídeo Não foram encontradas emissões de áudio - Diretório não existe - Não existe ficheiro/fonte de conteúdo + A pasta não existe + Esse ficheiro/fonte de conteúdo não existe O ficheiro não existe ou as permissões para ler ou escrever faltam O nome do ficheiro não pode estar vazio Ocorreu um erro: %1$s - Não existem emissões para descarregar - Descartar + Sem emissões disponíveis para transferir + Rejeitar Site - Visite ao site NewPipe para obter mais informações e saber as novidades. + Visite ao site NewPipe para obter mais informação e novidades. Página \"kiosk\" - Página da fonte + Página de \"Feed\" Exportados Importados Ficheiro ZIP inválido - Aviso: nem todos os ficheiros foram importados. + Aviso: não foi possível importar todos os ficheiros. Está prestes a substituir a configuração atual. Abrir menu Fechar menu Nome - Apagar meta-dados em cache - Remover todos os dados em cache - Meta-dados em cache apagados + Limpar os metadados em cache + Remover todos os dados da página da Web em cache + Metadados em cache limpos Ficheiro - Deseja apagar este item do histórico de visualizações\? - Tem a certeza de que deseja apagar todos os itens do histórico\? + Deseja eliminar este item do histórico de visualizações\? + Tem a certeza que deseja eliminar todos os itens do histórico\? Última reprodução Mais reproduzido - Algo vai surgir aqui em breve ;D + Irá aparecer aqui qualquer coisa brevemente ;D Reprodutor de vídeo Reprodutor em segundo plano Reprodutor \'popup\' Perguntar sempre - A obter informação… - A carregar o conteúdo... + A obter a informação… + A carregar o conteúdo solicitado Nova lista de reprodução - Apagar + Eliminar Renomear Adicionar à lista de reprodução Guardar lista de reprodução como favorita Remover marcador - Apagar esta lista de reprodução\? - Lista de reprodução criada com sucesso + Eliminar esta lista de reprodução\? + Criada a ista de reprodução Colocado na lista de reprodução - Miniatura alterada. + Miniatura da lista de reprodução alterada. Sem legendas Ampliar Gerado automaticamente @@ -329,59 +328,59 @@ Exportação anterior Não foi possível importar as subscrições Não foi possível exportar as subscrições - Importe as subscrições do YouTube descarregando o ficheiro exportado: + Importe as subscrições do YouTube transferindo o ficheiro de exportação: \n \n1. Aceda a este URL: %1$s -\n2. Inicie a sessão -\n3. A descarga deve ser iniciada (esse é o ficheiro de exportação) - Importe o seu perfil do SoundCloud digitando o URL ou a sua ID: +\n2. Inicie a sessão +\n3. A transferência deveria iniciar (esse é o ficheiro de exportação) + Importe o seu perfil do SoundCloud digitando o URL ou a sua Id.: \n -\n1. Ative o modo \'desktop\' no navegador web (o site não está disponível para dispositivos móveis) +\n1. Ative o modo de PC no navegador da Web (o site não está disponível para dispositivos móveis) \n2. Aceda a este URL: %1$s -\n3. Inicie a sessão -\n4. Copie o URL do seu perfil. +\n3. Inicie a sessão +\n4. Copie o URL do perfil em que foi redirecionado. suaID, soundcloud.com/suaID Controlos para velocidade de reprodução Ritmo Limpar histórico de visualizações Auto-aplicar uma emissão relacionada ao reproduzir a último emissão numa fila não repetitiva Mostrar dica \"Toque longo para colocar na fila\" - Mostrar dica quando o botão de fundo ou de \'popup\' for premido na página de detalhes do vídeo + Mostrar dica quando o botão de fundo ou da janela for premido na página de detalhes do vídeo Canais Listas de reprodução Faixas Utilizadores - Apaga o histórico dos vídeos reproduzidos - Apagar todo o histórico de visualizações\? - Histórico de vídeos apagado. - Apagar histórico de pesquisas - Apaga o histórico de palavras-chave pesquisadas - Apagar todo o histórico de pesquisa\? - Histórico de pesquisa apagado. - 1 elemento apagado. + Elimina o histórico dos vídeos reproduzidos e as posições de reprodução + Eliminar todo o histórico de visualizações\? + Histórico de vídeos apagado. + Limpar o histórico de pesquisas + Elimina o histórico das palavras-chave de pesquisa + Eliminar todo o histórico de pesquisa\? + Histórico de pesquisa eliminado. + 1 elemento eliminado. Não existe uma aplicação para reproduzir este ficheiro - NewPipe é desenvolvido por voluntários que usam o tempo livre para lhe proporcionar uma melhor experiência. Retribua para ajudar os programadores a tornarem o NewPipe ainda melhor. + NewPipe é desenvolvido por voluntários que utilizam o tempo livre para lhe proporcionar uma melhor experiência. Retribua para ajudar os programadores a tornarem o NewPipe ainda melhor enquanto desfruta de um café. Retribuir Política de privacidade do NewPipe O projeto NewPipe leva a sua privacidade muito a sério. Sendo assim, o aplicativo não coleta nenhum dado sem seu consentimento. \nA polícia de privacidade do NewPipe explica em detalhes qual dado é enviado e salvo quando você envia um relatório de erros. Ler a política de privacidade Colocar emissão seguinte na fila - NewPipe é copyleft libre software: você pode usar, estudar, partilhar e melhorar a aplicação. Especificamente, você pode redistribuir e/ou modificar a aplicação nos termos da GNU General Public License, conforme publicada pela Free Software Foundation, tanto a versão 3 da licença ou (por sua opção) qualquer versão posterior. - Deseja também importar as definições\? - Toque longo para colocar na fila - Colocar em fila se estiver em segundo plano - Colocar em novo \'popup\' - Ação \'abrir\' preferida - Ação padrão para abrir o conteúdo — %s + NewPipe é um software livre \"copyleft\": pode utilizar, estudar, partilhar e melhorar a aplicação. Especificamente, pode redistribuir e/ou modificar a aplicação nos termos da Licença Pública Geral GNU, conforme publicada pela Fundação de Software Livre, tanto a versão 3 da licença ou (por sua opção) qualquer versão superior. + Também deseja importar as definições\? + Toque longo para enfileirar + Colocar em fila em segundo plano + Colocar em fila num nova janela + Ação de \'abrir\' preferida + Ação predefinida para abrir o conteúdo — %s Definir como miniatura da lista de reprodução - Não foi possível apagar a lista de reprodução. + Não foi possível eliminar a lista de reprodução. Ajustar Preencher Modificar escala das legendas e o estilo de fundo. Tem que reiniciar a aplicação para aplicar as alterações. Ativar LeakCanary A monitorização de memória pode tornar a aplicação instável - Relatar erros \'out-of-lifecycle\' + Reportar os erros fora do ciclo de vida Forçar relatórios de exceções de Rx não entregues fora do ciclo de vida de fragmento ou atividade após a eliminação Tenha em atenção que esta operação pode sobrecarregar a sua rede. \n @@ -391,14 +390,14 @@ Avanço rápido durante silêncio Passo Repor - Para cumprir o Regulamento Geral sobre a Proteção de Dados (RGPD), chamamos a sua atenção para a política de privacidade do NewPipe. Por favor, leia com atenção. + Para cumprir com o Regulamento Geral da Proteção de Dados (RGPD), nós chamamos a sua atenção para a política de privacidade do NewPipe. Por favor, leia com atenção. \nTem que aceitar esta política para nos poder enviar o seu relatório. Aceitar Recusar Ilimitado Limitar resolução se estiver a usar dados móveis Minimizar ao trocar de aplicação - Ação a executar ao trocar para outra aplicação a partir do menu principal - % s + Ação a executar ao trocar para outra aplicação a partir do menu principal - %s Nenhuma Ativar o reprodutor em segundo plano Ativar o reprodutor \'popup\' @@ -410,16 +409,16 @@ Gestos para controlar o brilho Utilizar gestos para controlar o brilho do reprodutor Atualizações - Ficheiro apagado + Ficheiro eliminado Notificação de atualização Notificações para uma nova versão do NewPipe Armazenamento externo indisponível - Ainda não é possível descarrgar ao cartão SD. Repor localização da pasta de descargas\? - Erro ao ler os separadores guardados e serão usados os separadores padrão + Não é possível transferir para o cartão SD. Repor a localização da pasta de transferências\? + Erro ao ler os separadores guardados e serão usados os separadores predefinidos Restaurar predefinições Deseja restaurar as predefinições\? Número de subscritores não disponível - Separadores a mostrar na página principal + Quais os separadores que são mostrados na página principal Seleção Atualizações Mostrar uma notificação para pedir a atualização da aplicação se existir uma nova versão @@ -427,22 +426,22 @@ Lista Grelha Automático - Alternar vista - Atualização do NewPipe disponível! - Toque para descarregar + Mudar visualização + Disponível atualização do NewPipe! + Toque para transferir Terminada em pausa na fila pós-processamento Fila Ação recusada pelo sistema - Falha ao descarregar - Descarga terminada - %s descargas terminadas + Transferência falhou + Transferência concluída + %s transferências concluídas Gerar nome único Sobrescrever - Um ficheiro descarregado com este nome já existe - Já existe uma descarga em curso com este nome + Já existe um ficheiro transferido com este nome + Já existe uma transferência em progresso com este nome Mostrar erro Código O ficheiro não pode ser criado @@ -450,20 +449,60 @@ Permissão negada pelo sistema Ligação segura falhou Não foi possível encontrar o servidor - Não é possível conectar ao servidor + Não é possível ligar ao servidor O servidor não envia dados - O servidor não aceita descargas multi-threaded, tente novamente com @string/msg_threads = 1 + O servidor não aceita transferências de vários processos, tente novamente com @string/msg_threads = 1 Intervalo solicitado não satisfatório Não encontrado Pós-processamento falhado - Limpar descargas terminadas - Continue suas %s transferências pendentes de descarregamentos + Limpar transferências concluídas + Continue as suas %s transferências pendentes das Transferências Parar Tentativas máximas - Número máximo de tentativas antes de cancelar a descarga - Pausa na comutação para dados móveis - Descarregamentos que não podem ser pausados serão reiniciados + Número máximo de tentativas antes de cancelar a transferência + Interromper em redes limitadas + Útil quando mudar para dados móveis, embora algumas transferências não podem ser suspensas Eventos Conferências Pendente + Mostrar comentários + Desativar para parar de mostrar os comentários + Reprodução automática + + Comentário + Comentários + + Sem comentários + Não foi possível carregar os comentários + Fechar + Continuar reprodução + Restaurar a última posição de reprodução + Posições nas listas + Mostrar indicadores de posição de reprodução em listas + Limpar dados + Posições de reprodução eliminadas. + Ficheiro movido ou eliminado + Um ficheiro com este nome já existe + não é possível sobrescrever o ficheiro + Existe uma transferência pendente com este nome + NewPipe foi fechado enquanto trabalhava no ficheiro + Não há espaço disponível no dispositivo + Progresso perdido, porque o ficheiro foi eliminado + Tempo limite de conexão + Tem a certeza\? + Limitar a fila de transferências + Uma transferências será executada ao mesmo tempo + Iniciar transferências + Pausar transferências + Perguntar para onde transferir + Será-lhe solicitado para onde guardar cada transferência + Será-lhe solicitado para onde guardar cada transferência. +\nEscolha SAF se pretender transferir para um cartão SD externo + Usar SAF + A estrutura de acesso ao armazenamento permite transferências para um cartão SD externo. +\nNota: alguns dispositivos não são compatíveis + Eliminar as posições de reprodução + Elimina todas as posições de reprodução + Eliminar todas as posições de reprodução\? + Alterar as pastas de descarregamento para que tenham efeito \ No newline at end of file diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml index a37df98e9ed..358de0ca8af 100644 --- a/app/src/main/res/values-ro/strings.xml +++ b/app/src/main/res/values-ro/strings.xml @@ -17,10 +17,10 @@ Folosește un player video extern Folosește un player audio extern Locația videoclipurilor descărcate - Locul în care se vor descărca videoclipurile - Introduceți locația în care se vor descărca videoclipurile + Videoclipurile descărcate vor fi salvate aici + Introduceți locația unde se vor descărca videoclipurile Directorul audio-ului descărcat - Locul în care se va descărca audio-ul + Locul în care se vor descărca fișierele audio Introduceți locația în care se va descărca fişierele audio Rezoluție implicită Redați folosind Kodi @@ -35,7 +35,7 @@ Luminos Descărcați Următorul - Arată videoclipurile care urmează + Arată videoclipurile care urmează și similare URL nesuportat Limba dorită a conținutului Video & Audio @@ -102,13 +102,13 @@ Apasă pentru detalii Vă rugăm așteptați… Copiat în clipboard - Vă rugăm alegeți un folder pentru descărcări + Definiți un dosar de descărcare mai târziu în setări Deschide in modul popup Aceasta permisiune este necesara pentru a deschide în mod pop-up ReCAPTCHA - reCAPTCHA noua - reCAPTCHA noua ceruta + Provocare reCAPTCHA + reCAPTCHA nouă cerută NewPipe mod pop-up "Rezoluție pop-up inițială " Afișează rezoluții mai mari @@ -152,7 +152,7 @@ pentru a deschide în mod pop-up Ce este nou Istoric de căutări Stochează local căutările - Istoric și cache + Istoric vizualizări. Reține videoclipurile vizionate Reluați la refocalizare Continuă redarea după întreruperi (ex. după apeluri) @@ -181,7 +181,7 @@ pentru a deschide în mod pop-up %s videoclip %s videoclipuri - %s videoclipuri + %s de videoclipuri Descarcă Caractere permise în numele fișierelor @@ -238,13 +238,13 @@ pentru a deschide în mod pop-up Folosește parcurgerea inexactă Derularea inexactă permite player-ului să fie poziţionat mai rapid dar cu o precizie mai redusă Încarcă miniaturi - Dezactivați pentru a opri încărcarea și salvarea tuturor thumbnail-urilor, pentru a economisi consumul de date și de memorie. Schimbarea acestei opțiuni va curăța tot cache-ul din memorie și de pe disc. + Dezactivați pentru a opri încărcarea miniaturilor, reduce utilizarea datelor și a memoriei. Schimbarea va curăța tot cache-ul din memorie și de pe disc. Cache-ul de imagini a fost curățat Șterge cache-ul pentru metadata Șterge cache-ul pentru datele de pagini web Cache pentru metadata șters Adaugă următorul stream în coadă automat - Adaugă automat un stream asociat când se redă ultimul stream într-o coadă non-repetitivă. + Adaugă automat un stream asociat când se redă ultimul stream într-o coadă non-repetitivă Arată sfatul „Țineți apăsat pentru a adăuga” Arată sfatul când butonul de background sau de popup este apăsat în pagina de informații a videoclipului Țara implicită pentru conținut @@ -270,7 +270,7 @@ pentru a deschide în mod pop-up Niciun stream video găsit Niciun stream audio găsit Director Invalid - Sursă de conținut sau fișier invalidă + Nu există o astfel de sursă de fișier/conținut Fișierul nu există, sau nu dețineți suficiente permisiuni pentru a îl citi sau scrie Numele fișierului nu poate fi gol O eroare a apărut: %1$s @@ -296,8 +296,8 @@ pentru a deschide în mod pop-up Adăugaţi în fundal Adăugaţi în Popup Începeţi să redaţi de aici - Începeţi de aici în Fundal - Începeţi de aici în popup + Începe redarea în fundal + Începe redarea în popup Deschdeţi sertarul Închideţi sertarul Opţiunea de deschidere preferată @@ -313,7 +313,7 @@ pentru a deschide în mod pop-up Ştergeţi toate elementele Ignoraţi "Redenumiţi " - Niciun player a fost găsit pentru acest fişier + Nu este instalată nicio aplicație pentru a reda acest fișier Donaţi Ceva va apărea aici în curând ;D De asemenea, doriți să importați setări? @@ -329,7 +329,7 @@ pentru a deschide în mod pop-up Titluri Șterge istoricul vizionărilor \n - Șterge istoricul stream-urilor redate + Șterge istoricul stream-urilor redate și pozițiile memorate Șterge întregul istoric al vizionărilor\? 1 element șters. Playlist nou @@ -358,11 +358,56 @@ pentru a deschide în mod pop-up Fișier șters Notificare actualizare aplicație Notificări pentru noi versiuni NewPipe - Afișare istoric șters. + Afișare istoric șters. Șterge istoric căutare Ștergere istoric căutare cuvinte cheie Șterge întregul istoric căutare\? Istoric căutare șters Stocare externă indisponibilă - Descărcarea pe cardul SD extern nu este încă posibilă. Se resetează locația directorului de descărcări\? + Descărcarea pe cardul SD extern nu este posibilă. Se resetează locația directorului de descărcări\? + Obținerea informațiilor… + Se încarcă conținutul solicitat + Redenumire + Setați ca miniatură a listei de redare + Ștergeți această listă de redare\? + Miniatura listei de redare a fost modificată. + Nu s-a putut șterge lista de redare. + Fără subtitrări + Potrivire + Umplere + Mărire + Import/export + Subtitre + Modificați scala textului și stilurile de fundal. Necesită repornirea aplicației. + NewPipe este un software copyleft gratuit: îl puteți utiliza, studia, distribui și îl puteți îmbunătăți după bunul plac. În mod special, îl puteți redistribui și/sau modifica în condițiile Licenței publice generale GNU, publicată de Free Software Foundation, fie versiunea 3 a Licenței, fie (la opțiunea dvs.) orice versiune ulterioară. + Politica de confidențialitate a NewPipe + Proiectul NewPipe ia confidențialitatea în serios. Prin urmare, aplicația nu colectează date fără consimțământul dumneavoastră. +\nPolitica de confidențialitate a NewPipe explică în detaliu ce date sunt trimise și stocate atunci când trimiteți un raport de avarie. + Citiți politica de confidențialitate + Se folosesc filele implicite, eroare la citirea filelor salvate + Restabilire valori implicite + Doriți să restaurați setările implicite\? + Numărul abonaților nu este disponibil + Ce file sunt afișate pe pagina principală + Selecție + Conferințe + Afișare comentarii + Dezactivează pentru oprirea afișării comentariilor + Redare automată + + Comentarii + + + + Niciun comentariu + Nu s-au putut încărca comentariile + Reluare redare + Se restabilește ultima poziție de redare + Poziții în liste + Afișează indicatorii de poziție de redare în liste + Eliminare date + Pozițiile de redare șterse. + Fișier mutat sau șters + Șterge pozițiile de redare memorate + Schimbați folderul de descărcări pentru ca setările să aiba efect \ No newline at end of file diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 07a6ef7c8e2..ca692a06c20 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -14,8 +14,8 @@ Поделиться в Выбор браузера поворот - Путь для скачанного видео - Путь для сохранения скачанного видео + Папка для скачанного видео + Папка для скачанного видео Введите путь к папке для скачивания видео Разрешение по умолчанию Воспроизвести в Kodi @@ -27,13 +27,13 @@ Скачать Следующее URL не поддерживается - Показывать \"Следующее\" и \"Похожие\" видео + \"Следующее\" и похожие видео Язык контента по умолчанию Видео и аудио Внешний вид Другое - Изображение видео перед его просмотром - Изображение видео перед его просмотром + Миниатюра видео-превью + Миниатюра видео-превью Миниатюра аватара пользователя Не понравилось Понравилось @@ -46,7 +46,7 @@ Воспроизвести Ошибка сети Использовать Tor - Путь для скачанного аудио + Папка для скачанного аудио Папка для хранения скачанного аудио Введите путь к папке для скачанного аудио Начните с поиска @@ -65,10 +65,10 @@ Неверный URL или нет доступа к интернету Подробнее Скопировано в буфер обмена - Выберите доступную папку для загрузки - Ограниченный контент + Выберите папку для загрузки позже в настройках + Контент 18+ Ошибка - Ваш комментарий (по Английски): + Ваш комментарий (English): Не удалось создать папку для загрузки \"%1$s\" Автовоспроизведение Воспроизводить видео при вызове NewPipe из другого приложения @@ -82,7 +82,7 @@ Не удалось полностью разобрать веб-сайт Контент недоступен Не удалось создать меню загрузки - Прямые трансляции пока не поддерживается + Прямые трансляции пока не поддерживаются Не удалось загрузить изображение Приложение упало Простите, это не должно было произойти. @@ -104,8 +104,8 @@ Не удалось расшифровать подпись URL у видео Не удалось найти ни одного потока Воспроизвести - Фоновое воспроизведение - Всплывающее окно + В фоне + В окне Только некоторые устройства поддерживают видео в 2K/4K Формат видео по умолчанию Чёрная @@ -126,14 +126,14 @@ \nвоспроизведения в окне reCAPTCHA Открыть во всплывающем окне - Отображать предложения при поиске + Показать предложения при поиске Позже Отключено Изменение размера Убирает звук в НЕКОТОРЫХ разрешениях -  млн. -  млрд. -  тыс. + млн + млрд. + тыс. Разрешение очереди всплывающего окна Помнить последние размер и позицию всплывающего окна Поисковые предложения @@ -153,7 +153,7 @@ О приложении Участники Прочитать лицензию - Свободное легковесное потоковое воспроизведение на Android. + Свободное и легковесное потоковое воспроизведение для Android. Открыть на GitHub Приветствуется всё — идеи, перевод, изменения дизайна, чистка кода или огромные изменения в коде. Чем больше сделано, тем лучше! © %1$s %2$s под лицензией %3$s @@ -168,10 +168,10 @@ Хранить запросы поиска локально История просмотров Продолжать воспроизведение - Восстанавливать с последней позиции + Восстанавливать последнюю позицию Позиции в списках - Отображать индикаторы позиций просмотра в списках - Очистить данные + Показать индикаторы позиций просмотра в списках + Очистка данных Запоминать воспроизведённые потоки Возобновить при фокусе Возобновлять воспроизведение после перерывов (например, телефонных звонков) @@ -234,8 +234,8 @@ Тренды Топ 50 Новое и горячее - Добавлено в очередь на фоновое воспроизведение - Добавлено в очередь во всплывающем окне + Добавлено в очередь в фоне + Добавлено в очередь в окне Играть всё Не удалось воспроизвести этот поток Сведения @@ -244,8 +244,8 @@ Удалить Вы подписаны Подписка отменена - Показывать \"Зажмите, чтобы добавить\" - Показывать подсказку при нажатии кнопок всплывающего окна или фонового воспроизведения на странице сведений о видео + \"Зажмите, чтобы добавить\" + Показать подсказку при нажатии \"В окне\" или \"В фоне\" на странице сведений о видео [Неизвестно] Восстановление после ошибки плеера В фоне @@ -271,7 +271,7 @@ Видеопотоки не найдены Аудиопотоки не найдены Пожертвовать - Разработчики NewPipe ценой своего свободного времени делают вашу жизнь чуть удобнее. Отплатите им тем же — наслаждаясь чашечкой кофе, они смогут сделать NewPipe ещё лучше. + Разработчики NewPipe ценой своего свободного времени делают вашу жизнь чуть удобнее. Отплатите им тем же — наслаждаясь чашечкой кофе, они смогут сделать NewPipe ещё круче. Воздать должное Веб-сайт Для получения более подробной информации и последних новостей о NewPipe посетите наш веб-сайт. @@ -284,12 +284,12 @@ Загрузка запрошенного контента Скачать файл прямой трансляции Показать сведения - Закладки - Добавить к + Плейлисты + В плейлист Быстрый поиск позиции - Позволяет искать позицию быстрее, но с меньшей точностью + Выполняется быстрее, но с меньшей точностью Автодополнение очереди - Добавляет похожие потоки в очередь при воспроизведении последнего потока, если не включён повтор + Добавлять похожие потоки в очередь при воспроизведении последнего потока, если не включён повтор Отладка Файл Импорт данных @@ -324,7 +324,7 @@ Имя Добавить в плейлист На миниатюру плейлиста - Добавить закладку + Сохранить плейлист Удалить закладку Удалить плейлист\? Плейлист создан @@ -336,7 +336,6 @@ Заполнить Приблизить Созданы автоматически - Синхронизировать Включить LeakCanary Мониторинг утечки памяти может привести к зависанию приложения Сообщать об ошибках жизненного цикла @@ -367,7 +366,7 @@ \n \nПродолжить? Загружать миниатюры - Отключите, чтобы не загружать миниатюры и сэкономить трафик и память. Изменение настройки очистит кэш изображений. + Отключите, чтобы не загружать миниатюры и сэкономить трафик и память. Изменение настройки очистит кэш изображений Кэш изображений очищен Очистить кэш метаданных Кэш метаданных очищен @@ -383,10 +382,10 @@ Изменить размер текста и стиль титров. Нужен перезапуск Очистить историю просмотров Удалить всю историю просмотров\? - История просмотров удалена + История просмотров удалена Очистить историю поиска Удалить историю запросов поиска - Удалить историю воспроизведённых потоков + Удалить историю воспроизведённых потоков и позиции воспроизведения Удалить всю историю поиска\? История поиска удалена 1 элемент удалён. @@ -422,11 +421,11 @@ Автоматически Менять яркость плеера жестом Жест яркости - Загрузка на внешний накопитель пока невозможна. Сбросить расположение папки загрузки\? + Загрузка на внешний накопитель невозможна. Сбросить расположение папки загрузки\? Внешний накопитель недоступен Вкладки, видимые на главной странице - Восстановить значения по умолчанию - Хотите восстановить значения по умолчанию\? + Значения по умолчанию + Восстановить значения по умолчанию\? Ошибка чтения сохранённых вкладок. Используются вкладки по умолчанию Выбор Количество подписчиков недоступно @@ -441,7 +440,7 @@ Уведомление об обновлении Уведомления о новой версии NewPipe Обновления - Показать уведомление с предложением обновить приложение при наличии новой версии + Показать уведомление при наличии новой версии Доступно обновление NewPipe! Нажмите для загрузки Завершено @@ -469,17 +468,17 @@ пост-обработка В очереди Загрузка завершена - " %s загрузок завершено" + %s загрузок завершено Создать уникальное имя Возобновить приостановленные загрузки (%s) Максимум попыток - Максимальное число попыток перед отменой загрузки - Загрузки, которые невозможно приостановить, будут перезапущены + Количество попыток перед отменой загрузки + Некоторые загрузки не поддерживают докачку и начнутся с начала Не удалось установить защищённое соединение Не удалось соединиться с сервером Не удалось получить данные с сервера Пост-обработка не удалась - Останавливать скачивание при переходе на мобильную сеть + Прервать в мобильной сети Закрыть Время соединения вышло Уведомления @@ -496,4 +495,38 @@ Тип подключения Любая сеть Только WiFi + Показать комментарии + Отключите, чтобы скрыть комментарии + Автовоспроизведение + + Комментарии + + + + Нет комментариев + Не удалось загрузить комментарии + Позиции воспроизведения удалены + Файл перемещён или удалён + Файл с таким именем уже существует + не удаётся перезаписать файл + В очереди уже есть загрузка с таким именем + NewPipe была закрыта во время работы над файлом + Закончилось свободное место на устройстве + Прогресс потерян, так как файл был удалён + Вы уверены\? + Ограничить очередь загрузки + Только одна одновременная загрузка + Начать загрузку + Приостановить загрузку + Запрашивать папку загрузки + Для каждой загрузки запрашивать папку для сохранения + Для каждой загрузки запрашивать папку для сохранения. +\nИспользуйте SAF для загрузки на внешний накопитель + Использовать SAF + Storage Access Framework позволяет сохранять файлы на внешнем накопителе. +\nПоддерживается не всеми устройствами + Очистить позиции воспроизведения + Удалить все позиции воспроизведения + Удалить все позиции воспроизведения\? + Измените папки загрузки для вступления в силу \ No newline at end of file diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index b3c5ffe62d7..5682897d8e9 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -37,7 +37,7 @@ Ukázať \'Ďalšie\' a \'Podobné\' videá URL nie je podporovaná Preferovaný jazyk obsahu - Video & Zvuk + Video & zvuk Vzhľad Iné Prehrávanie na pozadí @@ -48,7 +48,6 @@ Nepodarilo sa dekódovať URL videa Nemožno analyzovať webovú stránku Obsah nie je dostupný - Náhľad videa Náhľad videa Náhľad avataru uploadera @@ -62,9 +61,9 @@ Automatické prehrávanie Prehrá video pri zavolaní NewPipe inou aplikáciou Obsah - Zobraziť vekovo obmedzený obsah + Vekovo obmedzený obsah Toto video je vekovo obmedzené. Povoľte zobrazenie obsahu v nastavení. - naživo + NAŽIVO Nemožno kompletne zanalyzovať web Nemožno nastaviť menu preberania Toto je ŽIVÉ VYSIELANIE, ktoré ešte nie je podporované. @@ -153,7 +152,7 @@ Čo je nové Hľadať v histórií Hľadané výrazy ukladať lokálne - História a vyrovnávacia pamäť + História pozretí Ukladať históriu pozretých videí Pokračovať po prepnutí zobrazenia Pokračovať po prerušeniach (napr. hlasový hovor) @@ -314,10 +313,6 @@ Prispôsobiť Vyplniť Zväčšiť - Veľkosť písma titulkov - Menšie Písmo - Normálne Písmo - Väčšie Písmo Používať rýchly posun Rýchly posun umožňuje prejsť na novú pozíciu rýchlejšie, ale s menšou presnosťou Načítanie miniatúr @@ -380,12 +375,11 @@ Rýchlosť Výška "Spomalenie (môže spôsobovať skreslenie)" - Nightcore režim Predvolené Vymazať históriu pozretí Odstráni históriu prehrávaných streamov Vymazať celú históriu pozretí. - História pozretí bola vymazaná. + História pozretí bola vymazaná. Vymazať históriu vyhľadávania Vymaže históriu vyhľadávania kľúčových slov Vymazať celú históriu vyhľadávania. @@ -479,4 +473,43 @@ Maximálny počet pokusov pred zrušením stiahnutia Pozastaviť pri prechode na mobilné dáta Preberania, ktoré nie je možné pozastaviť, budú reštartované + Zobraziť komentáre + Vypnutím tejto funkcie sa nebudú zobrazovať komentáre + Automatické prehrávanie + + Komentáre + + + + Žiadne komentáre + Nemožno načítať komentáre + Zatvoriť + Pokračovať v prehrávaní + Obnovenie poslednej pozície prehrávania + Poradie v zoznamoch + Zobraziť indikátory polohy prehrávania v zoznamoch + Vymazať údaje + Pozície prehrávania boli odstránené. + Súbor bol presunutý alebo odstránený + súbor nemožno prepísať + Súbor s rovnakým názvom už čaká na stiahnutie + NewPipe bol ukončený počas spracovávania súboru + Máš plnú pamäť + Nemožno pokračovať, súbor bol vymazaný + Spojenie vypršalo + Ste si istý\? + Limitovať počet položiek pri sťahovaní + Súbory sa budú sťahovať jeden po druhom + Spustite sťahovanie + Pozastaviť sťahovanie + Pýtať sa na adresár sťahovania + Pri každom sťahovaní súboru sa bude vyžadovať zadanie cieľového adresára + Pri každom sťahovaní súboru sa bude vyžadovať zadanie cieľového adresára +\nZvoľte SAF pokiaľ chcete ukladať na externé úložisko + Použiť SAF + Storage Access Framework umožňuje sťahovanie na externú SD kartu. +\nPoznámka: Niektoré zariadenia nie sú kompatibilné + Odstrániť pozície prehrávania + Odstráni všetky pozície prehrávania + Odstrániť všetky pozície prehrávania\? \ No newline at end of file diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index 0fef06279fd..d5f031ad839 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -47,9 +47,9 @@ Светла Изглед Грешка мреже - Одредиште преузимања за аудио + Фолдер преузимања за аудио Унесите путању за преузимање аудио фајлова - Путања за упис преузетих аудио фајлова + Овде се чувају преузети аудио-снимци Направљен директоријум за преузимање „%1$s“ Не могу да направим директоријум за преузимање„ %1$s“ Грешка @@ -133,7 +133,7 @@ Очисти Позадина Прозорче - Неке резолуције биће БЕЗ звука када је ова опција укључена + Уклања звук на неким резолуцијама Упамти величину и позицију искачућег прозора Памти последњу величину и позицију искачућег прозорчета Контроле прејера потезом @@ -243,7 +243,7 @@ Нема плејера тока (можете инсталирати ВЛЦ). Преузимање фајла тока Прикажи податке - Обележивачи + Сачуване плејлисте Додај у Подразумевана држава за садржај Услуга @@ -259,4 +259,16 @@ Да бисте добили више информација и најновије вести о ЊуПајпу посетите наш вебсајт. Задржи за стављање у ред Пусти одавде + Користи брзо, али непрецизно премотавање + Омогућава плејеру да брже долази до позиције уз смањену прецизност + Учитавање слика + Искључите како се не би преузимале слике, чиме ћете смањити количину пренетог саобраћаја и потрошњу меморије. Промена ове опције ће уклонити слике из радне и трајне меморије. + Очишћен кеш са сликама + Уклони кеширане метаподатке + Уклони све податке о кешираним веб-странама + Откажи претплату + Нова картица + Одабери картицу + Приказивање коментара + Искључите како се не би приказивали коментари \ No newline at end of file diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 18ceb75a445..0d583a41be5 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -320,7 +320,7 @@ Rensa visningshistorik Tar bort historiken för spelade videoklipp Ta bort hela visningshistoriken\? - Visningshistorik borttagen. + Visningshistorik borttagen. Rensa sökhistorik Tar bort historiken för sökta nyckelord Ta bort hela sökhistoriken\? diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml index 7aa02118236..6f71a8b97ea 100644 --- a/app/src/main/res/values-ta/strings.xml +++ b/app/src/main/res/values-ta/strings.xml @@ -1,25 +1,25 @@ - தொடங்குவதற்கு தேடல் பொத்தானை அழுத்தவும் - "%1$s பார்வைகள்" - "%1$s அன்று வெளியிடப்பட்டது" - ஸ்டீரீம் பிளேயர் கண்டறியப்படவில்லை. வில்சி நிருவ வேண்டுமா? - நிறுவ + தொடங்க தேடலை அழுத்தவும் + %1$s பார்வைகள் + %1$s அன்று வெளியிடப்பட்டது + நிகழ்பட ஓட்டி கண்டறியப்படவில்லை. VLC நிறுவ வேண்டுமா\? + நிறுவு ரத்துசெய் - உலாவியில் திறக்க + உலாவியில் திற பகிர் - பதிவிறக்க - தேடல் + பதிவிறக்கு + தேடு அமைப்புகள் - பகிர + இதனுடன் பகிர் உலாவியை தேர்ந்தெடு சுழற்சி - எந்த ஒரு இயக்கியும் கிடைக்கவில்லை (VLC-ஐ பயன்படுத்தவும்). - திரைமேல் நிலையில் காணவும் - தாரை கோப்பை பதிவிறக்கு - நீங்கள் கூறியது: %1$s இதுதானா\? - வெளி காணொலி இயக்கியை பயன்படுத்தவும் - வெளி ஒலி இயக்கியை பயன்படுத்தவும் + நிகழ்பட ஓட்டி கிடைக்கவில்லை (தாங்கள் VLC-ஐ பயன்படுத்தலாம்). + திரைமேல் நிலையில் காட்டவும் + நிகழ்பட கோப்பை பதிவிறக்கு + நீங்கள் கூறியது: %1$s\? + வேறு நிகழ்பட ஓட்டியை பயன்படுத்தவும் + வேறு ஒலி இயக்கியை பயன்படுத்தவும் NewPipe திரைமேல் நிலை குழுசேர் குழு சேர்க்கப்பட்டது @@ -93,7 +93,7 @@ ஒரு முறை கோப்பு பார்த்த வரலாற்றை நீக்கு - பார்த்த வரலாறு அழிக்கப்பட்டது. + பார்த்த வரலாறு அழிக்கப்பட்டது. பார்த்த வரலாற்றை நீக்கு தேடல் வரலாறு அழிக்கப்பட்டது. கோப்பு பெயர் காலியாக இருக்க முடியாது @@ -105,7 +105,7 @@ முடிவுகள் இல்லை எந்த முடிவுகளும் இல்லை இழுத்து வரிசைமாற்று - தரவிறக்க அடைவு உருவாக்கப்பட்டது \'%1$s\' + \'%1$s\'-ல் தரவிறக்க அடைவு உருவாக்கப்பட்டது காணொலி ஒலி மீண்டும் முயற்சி @@ -121,7 +121,6 @@ தேடப்பட்ட வாக்கியத்தை அமைவிடத்தில் சேமிக்கவும் ஆதரிக்கப்படாத URL இயல்புநிலை தகவல்களின் நாடு - தகவல்களின் இயல்பு மொழி பிழைதிருத்து உள்ளடக்கம் வயது வரம்புக்கு உட்பட்டது @@ -155,4 +154,5 @@ "NewPipe பின்னனி மற்றும் பாப்அப் இயக்கிகளின் அறிவிப்புகள்" "பாப்அப் இயக்கிக்கு மாறு " குழுவிலகு + வரிசை \ No newline at end of file diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml index ff9969abc9d..17519e08434 100644 --- a/app/src/main/res/values-te/strings.xml +++ b/app/src/main/res/values-te/strings.xml @@ -10,7 +10,7 @@ డౌన్లోడ్ శోధిచు సెట్టింగ్‌లు - అంటే నువ్వు అనేది + అంటే నువ్వు అనేది: %1$s\? తో పంచు బ్రౌజర్ను ఎంచుకోండి రొటేషన్ diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml new file mode 100644 index 00000000000..961a796f522 --- /dev/null +++ b/app/src/main/res/values-th/strings.xml @@ -0,0 +1,448 @@ + + + แตะที่ปุ่มค้นหาเพื่อเริ่มต้น + %1$s ครั้ง + เผยแพร่เมื่อ %1$s + ไม่พบแอปที่สามารถสตรีมสื่อวีดีโอได้ คุณต้องการติดตั้ง VLC หรือไม่\? + ไม่พบแอปที่สามารถสตรีมสื่อวีดีโอได้ (คุณสามารถติดตั้ง VLC เพื่อดูวีดีโอ) + ติดตั้ง + ยกเลิก + เปิดด้วยเว็บบราวเซอร์ + เปิดในโหมดป๊อปอัพ + แชร์ + ดาวน์โหลด + ดาวน์โหลดไฟล์สตรีม + ค้นหา + ตั้งค่า + หรือคุณหมายถึง: %1$s\? + แชร์ด้วย + เลือกบราวเซอร์ + หมุน + ใช้แอปเล่นวีดีโอภายนอก + ใช้แอปเล่นเสียงภายนอก + NewPipe โหมดป๊อปอัพ + ติดตาม + ติดตามแล้ว + ยกเลิกการติดตาม + ยกเลิกการติดตามช่องแล้ว + ไม่สามารถเปลี่ยนสถานะการติดตามได้ + ไม่สามารถอัปเดตการติดตาม + แสดงข้อมูล + หน้าหลัก + การติดตาม + เพลย์ลิสต์ที่เก็บไว้ + แท็บใหม่ + เลือกแท็บ + มีอะไรใหม่ + พื้นหลัง + ป๊อปอัพ + เพิ่มไปยัง + เส้นทางการดาวน์โหลดวิดีโอ + เส้นทางในการจัดเก็บวิดีโอที่ดาวน์โหลดมา + ป้อนเส้นทางการดาวน์โหลดสำหรับวิดีโอ + โฟลเดอร์ที่ดาวน์โหลดเสียง + เสียงที่ดาวน์โหลดจะถูกเก็บไว้ที่นี่ + ป้อนเส้นทางการดาวน์โหลดสำหรับไฟล์เสียง + เล่นอัตโนมัติ + เล่นวิดีโอเมื่อ NewPipe ถูกเรียกจากแอปอื่น + ความละเอียดเริ่มต้น + ความละเอียดเริ่มต้นในโหมดป๊อปอัพ + แสดงความละเอียดที่สูงขึ้น + เฉพาะบางอุปกรณ์ที่รองรับการเล่นวิดีโอ 2K/4K + เปิดด้วย Kodi + ไม่พบแอป Kore จะติดตั้งหรือไม่\? + แสดงตัวเลือก \"เปิดด้วย Kodi\" + แสดงตัวเลือกในการเล่นวิดีโอผ่าน Kodi media center + เสียง + รูปแบบเสียงเริ่มต้น + รูปแบบวีดีโอเริ่มต้น + ธีม + สว่าง + มืด + สีดำ + จำขนาดและตำแหน่งของป๊อปอัพ + จำขนาดและตำแหน่งสุดท้ายของป๊อปอัพ + ใช้การข้ามที่ไม่แม่นยำ + การข้ามช่วงที่ไม่แม่นยำจะทำให้เลื่อนไปยังตำแหน่งเวลาที่ต้องการได้เร็วขึ้น แต่จะลดความแม่นยำในการลากตำแหน่งลง + โหลดภาพขนาดย่อ + แสดงความคิดเห็น + ปิดใช้งานเพื่อซ่อนความคิดเห็น + ปิดเพื่อป้องกันการโหลดรูปขนาดย่อ ลดการใช้ข้อมูลและหน่วยความจำ การเปลี่ยนแปลงล้างแคชภาพในหน่วยความจำและบนดิสก์ + ล้างแคชของรูปภาพแล้ว + ลบข้อมูลเว็บเพจที่แคชไว้ทั้งหมด + คิววีดีโอถัดไปโดยอัตโนมัติ + ต่อท้ายวีดีโอที่เกี่ยวข้องโดยอัตโนมัติเมื่อเล่นถึงรายการสุดท้ายในกรณีที่ไม่ได้ตั้งให้เล่นซ้ำ + การควบคุมระดับเสียงด้วยท่าทาง + ใช้ท่าทางสัมผัสเพื่อควบคุมระดับเสียงของเครื่องเล่น + การควบคุมความสว่างด้วยท่าทาง + ใช้ท่าทางสัมผัสเพื่อควบคุมความสว่างของเครื่องเล่น + ตัวควบคุมท่าทางของโปรแกรมเล่น + ใช้ท่าทางสัมผัสเพื่อควบคุมความสว่างและระดับเสียงของเครื่องเล่น + คำแนะนำการค้นหา + แสดงคำแนะนำเมื่อทำการค้นหา + ประวัติการค้นหา + จัดเก็บคำที่เคยค้นหาไว้ในเครื่อง + ประวัติการดู + เก็บประวัติการเข้าดูวีดิโอไว้ + เล่นต่อหลังการขัดจังหวะ (เช่น การรับโทรศัพท์) + ดาวน์โหลด + วีดีโอถัดไป + เล่นอัตโนมัติ + แสดงวิดีโอ \'ถัดไป\' และ \'ที่คล้ายกัน\' + แสดงเคล็ดลับ \"แตะค้างเพื่อเพิ่ม\" + แสดงเคล็ดลับเมื่อกดปุ่มพื้นหลังหรือป๊อปอัพในหน้ารายละเอียดวิดีโอ + URL ที่ไม่สนับสนุน + ประเทศเริ่มต้นของเนื้อหา + บริการ + ภาษาของเนื้อหาเริ่มต้น + เครื่องเล่น + พฤติกรรม + วิดีโอและเสียง + ประวัติและแคช + ป๊อปอัพ + ลักษณะ + อื่นๆ + แก้ข้อบกพร่อง + อัพเดต + กำลังเล่นในโหมดพื้นหลัง + กำลังเล่นในโหมดป๊อปอัพ + จัดคิวลงในการเล่นโหมดพื้นหลังแล้ว + จัดคิวลงในการเล่นโหมดป๊อปอัพแล้ว + เล่น + เนื้อหา + เนื้อหาที่จำกัดอายุ + แสดงวิดีโอที่จำกัดอายุ การอนุญาตดังกล่าวเป็นไปได้จากการตั้งค่า + สด + ดาวน์โหลด + ดาวน์โหลด + รายงานข้อผิดพลาด + ทั้งหมด + ช่อง + ช่อง + เพลย์ลิสต์ + เพลย์ลิสต์ + แทร็ค + ผู้ใช้ + เหตุการณ์ + ใช่ + ในภายหลัง + ปิดการใช้งาน + ตัวกรอง + เรียกใหม่ + ล้าง + กำลังปรับขนาด + ความละเอียดที่ดีที่สุด + เลิกทำ + ลบไฟล์แล้ว + เล่นทั้งหมด + ตลอดเวลา + เพียงครั้งเดียว + ไฟล์ + การแจ้งเตือน NewPipe + การแจ้งเตือนของแอป NewPipe เมื่อเล่นสื่อในโหมดพื้นหลังและป๊อปอัพ + การแจ้งเตือนการอัปเดตแอป + การแจ้งเตือนสำหรับ NewPipe เวอร์ชั่นใหม่ + [ไม่ทราบ] + เปลี่ยนการวางแนว + สลับไปยังโหมดพื้นหลัง + สลับไปยังโหมดป๊อปอัพ + สลับไปยังโหมดหลัก + นำเข้าฐานข้อมูล + ส่งออกฐานข้อมูล + แทนที่ประวัติการดูและการสมัครรับข้อมูลของคุณ + ส่งออกประวัติการดู ช่องที่ได้บอกรับและเพลย์ลิสต์ + ล้างประวัติการดู + ลบประวัติของวีดีโอที่เคยเล่น + ลบประวัติการดูทั้งหมดหรือไม่\? + ลบประวัติการดูแล้ว + ล้างประวัติการค้นหา + ลบประวัติของคำที่เคยค้นหา + ลบประวัติการค้นหาทั้งหมดหรือไม่\? + ลบประวัติการค้นหาแล้ว + เกิดข้อผิดพลาด + พื้นที่เก็บข้อมูลภายนอกไม่พร้อมใช้งาน + การดาวน์โหลดไปยังการ์ดความจำภายนอกยังไม่สามารถทำได้ รีเซ็ตตำแหน่งโฟลเดอร์ดาวน์โหลดหรือไม่\? + ข้อผิดพลาดของเครือข่าย + ไม่สามารถโหลดรูปขนาดย่อทั้งหมด + ไม่สามารถถอดรหัสลายเซ็น URL ของวิดีโอ + ไม่สามารถแยกวิเคราะห์เว็บไซต์ + ไม่สามารถแยกวิเคราะห์เว็บไซต์ได้อย่างสมบูรณ์ + เนื้อหาไม่พร้อมใช้งาน + ไม่สามารถตั้งค่าเมนูดาวน์โหลด + ยังไม่รองรับสตรีมแบบสดในขณะนี้ + ไม่สามารถรับสตรีมใดๆ + ไม่สามารถโหลดรูปภาพ + แอป / UI ขัดข้อง + ไม่สามารถเล่นสตรีมนี้ + เกิดข้อผิดพลาดของตัวเล่นที่ไม่สามารถกู้คืนได้ + กำลังกู้คืนจากข้อผิดพลาดของตัวเล่น + ตัวเล่นภายนอกไม่สนับสนุนลิงก์ประเภทนี้ + URL ไม่ถูกต้อง + ไม่พบสตรีมวิดีโอ + ไม่พบสตรีมเสียง + ไม่มีโฟลเดอร์ตามที่ระบุ + ไม่มีแหล่งแฟ้ม/เนื้อหาดังกล่าว + ไฟล์นี้ไม่มีอยู่หรือไม่ได้รับอนุญาตให้อ่านหรือเขียนไฟล์ + ชื่อไฟล์ต้องไม่ว่างเปล่า + เกิดข้อผิดพลาด: %1$s + ไม่มีสตรีมให้ดาวน์โหลด + เรียกคืนการวางตำแหน่งแท็บเป็นค่าเดิม เนื่องจากพบข้อผิดพลาดในการอ่านการวางตำแหน่งแท็บที่บันทึกไว้ + คืนค่าเริ่มต้น + คุณต้องการคืนค่าเริ่มต้นหรือไม่\? + รายงานข้อผิดพลาดผ่านทาง e-mail + ข้อมูล: + เกิดอะไรขึ้น: + ความคิดเห็นของคุณ (เป็นภาษาอังกฤษ): + รายละเอียด: + ภาพขนาดย่อของตัวอย่างวิดีโอ + ภาพของตัวอย่างวิดีโอขนาดย่อ + รูปขนาดย่อของผู้อัปโหลด + ชอบ + ไม่ชอบ + ใช้ Tor + (ทดลอง) บังคับให้ใช้การเชื่อมต่อผ่าน Tor เพื่อเพิ่มความเป็นส่วนตัว (ยังไม่รองรับวิดีโอสตรีมมิ่ง) + รายงานข้อผิดพลาด + ไม่มีผลลัพธ์ + ไม่มีอะไรที่นี่นอกจากจิ้งหรีด + ลากเพื่อจัดลำดับใหม่ + ไม่สามารถสร้างไดเรกทอรีดาวน์โหลด \'%1$s\' + สร้างไดเรกทอรีดาวน์โหลด \'%1$s\' + วิดีโอ + เสียง + ลองอีกครั้ง + สิทธิ์การเข้าถึงการจัดเก็บข้อมูลถูกปฏิเสธ + พัน + ล้าน + พันล้าน + ไม่มีสมาชิกที่สมัครรับ + + %s บอกรับ + + ไม่สามารถนับจำนวนสมาชิกได้ + ไม่มียอดวิว + + %s วิว + + ไม่มีวิดีโอ + ไม่มีความคิดเห็น + เริ่ม + หยุดพัก + เล่น + สร้าง + ลบ + ลบหนึ่งรายการ + ลบทั้งหมด + ไม่สนใจ + เปลี่ยนชื่อ + ภารกิจใหม่ + ชื่อไฟล์ + เซิร์ฟเวอร์ที่ไม่รองรับ + ไฟล์มีอยู่แล้ว + NewPipe กำลังดาวน์โหลด + แตะเพื่อดูรายละเอียด + โปรดรอ… + คัดลอกไปที่คลิปบอร์ดแล้ว + โปรดเลือกโฟลเดอร์ดาวน์โหลดที่พร้อมใช้งาน + การอนุญาตนี้เป็นสิ่งจำเป็นเพื่อ +\nเปิดในโหมดป๊อปอัป + ลบ 1 รายการแล้ว + ดาวน์โหลด + อักขระที่อนุญาตในชื่อไฟล์ + อักขระที่ไม่ถูกต้องจะถูกแทนที่ด้วยค่านี้ + อักขระทดแทน + ตัวอักษรและตัวเลข + อักขระพิเศษส่วนใหญ่ + ไม่มีแอพที่ติดตั้งเพื่อให้เล่นไฟล์นี้ได้ + เกี่ยวกับ NewPipe + การตั้งค่า + เกี่ยวกับ + สัญญาอนุญาตของบุคคลที่สาม + © %1$s โดย %2$s ภายใต้ %3$s + ไม่สามารถโหลดสัญญาอนุญาต + เปิดเว็บไซต์ + เกี่ยวกับ + ผู้มีส่วนร่วม + สัญญาอนุญาต + แอปสตรีมมิ่งที่เล็กและเสรีบน Android + สนับสนุน + ไม่ว่าคุณจะมีความคิดที่จะช่วยแปลภาษา เปลี่ยนดีไซน์ แก้ไขโค้ดของโปรแกรมให้ดีขึ้นทั้งในระดับเล็กน้อยหรือจะเปลี่ยนแปลงกันแบบขนานใหญ่ เรายินดีให้คุณได้ร่วมช่วยเหลือเสมอ… ยิ่งทำมาก ยิ่งช่วยให้ดีขึ้นมาก! + ดูบน GitHub + บริจาค + คืนให้ + เว็บไซต์ + เยี่ยมชมเว็บไซต์ NewPipe สำหรับข้อมูลเพิ่มเติมและข่าวสาร + นโยบายความเป็นส่วนตัวของ NewPipe + โครงการ NewPipe คำนึงถึงความเป็นส่วนตัวของคุณอย่างจริงจัง ดังนั้นแอปจะไม่เก็บรวบรวมข้อมูลใดๆ โดยไม่ได้รับความยินยอมจากคุณ +\nนโยบายความเป็นส่วนตัวของ NewPipe มีการอธิบายในรายละเอียดเกี่ยวกับข้อมูลที่จะถูกส่งออกไปและเก็บไว้เมื่อคุณรายงานความผิดพลาดของแอป + อ่านนโยบายความเป็นส่วนตัว + สัญญาอนุญาตของ NewPipe + อ่านสัญญาอนุญาต + ประวัติ + สืบค้นแล้ว + ดูแล้ว + ประวัติการดูได้ปิดใช้งานอยู่ + ประวัติ + ประวัติว่างเปล่า + ล้างประวัติแล้ว + ลบรายการแล้ว + คุณต้องการลบรายการนี้ออกจากประวัติการค้นหาหรือไม่\? + คุณต้องการลบรายการนี้ออกจากประวัติการดูหรือไม่\? + คุณแน่ใจหรือไม่ว่าต้องการลบรายการประวัติทั้งหมด\? + เล่นครั้งล่าสุด + เล่นมากที่สุด + เนื้อหาของหน้าหลัก + แท็บใดบ้างที่ต้องการให้แสดงบนหน้าหลัก + การเลือก + หน้าว่าง + หน้า Kiosk + หน้าการสมัครสมาชิก + หน้าฟีด + หน้าของช่อง + เลือกช่อง + ยังไม่มีการสมัครรับข้อมูลช่องในตอนนี้ + เลือกหน้า Kiosk + ส่งออกแล้ว + นำเข้าแล้ว + ไม่มีไฟล์ ZIP ที่ถูกต้อง + คำเตือน: ไม่สามารถนำเข้าไฟล์ทั้งหมดได้ + สิ่งนี้จะแทนที่การตั้งค่าปัจจุบันของคุณ + คุณยังต้องการนำเข้าการตั้งค่าด้วยหรือไม่\? + ไม่สามารถโหลดความคิดเห็นได้ + ได้รับความนิยม + 50 อันดับแรก + ใหม่และมาแรง + การประชุม + เครื่องเล่นพื้นหลัง + เครื่องเล่นป๊อปอัพ + เอาออก + รายละเอียด + การตั้งค่าเสียง + กดค้างไว้เพื่อเพิ่มลงในคิว + เล่นโดยตรงในโหมดพื้นหลัง + เพิ่มคิวในโหมดพื้นหลัง + เพิ่มคิวในโหมดป๊อปอัพ + เริ่มเล่นจากตรงนี้ + เล่นจากจุดนี้ในโหมดพื้นหลัง + เล่นจากจุดนี้ในโหมดป๊อปอัพ + บางสิ่งบางอย่างจะปรากฏที่นี่เร็วๆ นี้ ;D + การดำเนินการ \'เปิด\' ที่ต้องการ + การดำเนินการเริ่มต้นเมื่อเปิดเนื้อหา — %s + เครื่องเล่นวิดีโอ + เครื่องเล่นพื้นหลัง + เครื่องเล่นป๊อปอัพ + ถามเสมอ + กำลังรับข้อมูล… + กำลังโหลดเนื้อหาที่ร้องขอ + เพลย์ลิสต์ใหม่ + ลบ + เปลี่ยนชื่อ + ชื่อ + เพิ่มในเพลย์ลิสต์ + ตั้งเป็นรูปขนาดย่อของเพลย์ลิสต์ + เก็บเพลย์ลิสต์ + เอาที่คั่นหน้าออก + ลบเพลย์ลิสต์นี้หรือไม่\? + สร้างเพลย์ลิสต์แล้ว + เพิ่มลงในเพลย์ลิสต์แล้ว + เปลี่ยนภาพย่อของเพลย์ลิสต์แล้ว + ไม่สามารถลบเพลย์ลิสต์ได้ + ไม่มีคำอธิบายภาพ + พอดี + เติม + ขยาย + สร้างขึ้นโดยอัตโนมัติ + คำบรรยายภาพ + ปรับเปลี่ยนขนาดตัวอักษร สีของข้อความหรือพื้นหลังของคำอธิบายภาพ (จำเป็นตองปิดและเปิดแอปใหม่เพื่อให้การเปลี่ยนแปลงมีผล) + เปิดใช้งาน LeakCanary + การตรวจสอบการรั่วไหลของหน่วยความจำอาจทำให้แอปจะไม่ตอบสนองเมื่อมีการดึงข้อมูลจากหน่วยความจำ + นำเข้า/ส่งออก + นำเข้า + นำเข้าจาก + ส่งออกไปยัง + กำลังนำเข้า… + กำลังส่งออก… + นำเข้าไฟล์ + การส่งออกก่อนหน้านี้ + ไม่สามารถนำเข้าการสมัครรับข้อมูล + ไม่สามารถส่งออกการสมัครรับข้อมูล + นำเข้ารายการช่องที่บอกรับใน YouTube โดยการดาวน์โหลดไฟล์การส่งออก: +\n +\n1. ไปที่ URL นี้: %1$s +\n2. เข้าสู่ระบบเมื่อระบบถาม +\n3. การดาวน์โหลดควรเริ่มต้น (นั่นคือไฟล์ที่ส่งออก) + นำเข้าโปรไฟล์ SoundCloud โดยการพิมพ์ URL หรือรหัสไอดีผู้ใช้ของคุณ: +\n +\n1. เปิดใช้งาน \"โหมดเดสก์ท็อป\" ในเว็บเบราว์เซอร์ (เว็บไซต์ไม่สามารถใช้ได้สำหรับอุปกรณ์มือถือ) +\n2. ไปที่ URL นี้: %1$s +\n3. เข้าสู่ระบบเมื่อระบบถาม +\n4. คัดลอก URL ของโปรไฟล์ที่คุณถูกเปลี่ยนเส้นทางไป + โปรดทราบว่าการดำเนินการนี้อาจใช้งานข้อมูลมือถือที่มีค่าใช้จ่าย +\n +\nคุณต้องการที่จะทำต่อไปหรือไม่\? + การควบคุมความเร็วในการเล่น + จังหวะ + เสียงสูงต่ำ + ยกเลิกการเชื่อมโยง (อาจทำให้เสียงมีการบิดเบือน) + กรอไปข้างหน้าระหว่างความเงียบ + ทีละ + รีเซ็ต + เพื่อให้สอดคล้องกับระเบียบข้อบังคับว่าด้วยการป้องกันข้อมูลทั่วไปของยุโรป (GDPR) เราขอแนะนำให้คุณอ่านนโยบายความเป็นส่วนตัวของ NewPipe อย่างระมัดระวังและถี่ถ้วน +\nคุณต้องยอมรับข้อตกลงเพื่ออนุญาตให้ส่งรายงานข้อผิดพลาดถึงเรา + ยอมรับ + ปฏิเสธ + ไม่จำกัด + จำกัดความละเอียดเมื่อใช้ข้อมูลมือถือ + อัพเดท + แสดงการแจ้งเตือนการปรับปรุงให้ทราบก่อนอัพเดทแอพ เมื่อมีเวอร์ชั่นใหม่ให้พร้อมใช้งาน + ย่อเล็กสุดเมื่อสลับแอป + การดำเนินการเมื่อสลับไปยังแอปอื่นๆ จากโปรแกรมเล่นวิดีโอหลัก — %s + ไม่มี + ย่อเล็กสุดไปยังการเล่นพื้นหลัง + ย่อเล็กสุดไปยังการเล่นป๊อปอัพ + โหมดมุมมองรายการ + รายการ + ตาราง + อัตโนมัติ + สลับมุมมอง + NewPipe พร้อมให้อัพเดทแล้ว! + แตะเพื่อดาวน์โหลด + เสร็จแล้ว + อยู่ในคิว + หยุดชั่วคราว + อยู่ในคิวแล้ว + คิว + การดำเนินการถูกปฏิเสธโดยระบบ + การดาวน์โหลดล้มเหลว + การดาวน์โหลดเสร็จสิ้น + %s การดาวน์โหลดเสร็จสิ้น + สร้างชื่อเฉพาะ + เขียนทับ + ไฟล์ที่ดาวน์โหลดด้วยชื่อนี้มีอยู่แล้ว + มีการดาวน์โหลดที่กำลังดำเนินการอยู่ด้วยไฟล์ชื่อนี้อยู่แล้ว + แสดงข้อผิดพลาด + โค้ด + ไม่สามารถสร้างไฟล์ได้ + ไม่สามารถสร้างโฟลเดอร์ปลายทางได้ + การอนุญาตถูกปฏิเสธโดยระบบ + ล้มเหลวในการสร้างการเชื่อมต่อที่ปลอดภัย + ไม่พบเซิร์ฟเวอร์ + ไม่สามารถเชื่อมต่อกับเซิร์ฟเวอร์ + เซิร์ฟเวอร์ไม่ส่งข้อมูล + เซิร์ฟเวอร์ไม่รองรับการดาวน์โหลดแบบพร้อมกันหลายส่วน โปรดลองอีกครั้งด้วย @string/msg_threads = 1 + ไม่พบ + ล้างการดาวน์โหลดที่เสร็จสิ้นแล้ว + หยุด + จำนวนครั้งสูงสุดที่จะลองใหม่ + จำนวนครั้งสูงสุดที่จะลองใหม่ก่อนจะยกเลิกการดาวน์โหลด + หยุดชั่วคราวเมื่อเปลี่ยนเป็นข้อมูลมือถือ + การดาวน์โหลดที่ไม่สามารถหยุดพักได้จะเริ่มต้นใหม่ + ปิด + บางความละเอียดอาจไม่มีเสียง + แคช metadate ถูกลบแล้ว + เล่นต่อหลังจากการขัดจังหวะ + เล่นต่อ + เล่นต่อจากที่เคยเล่นครั้งล่าสุด + ตำแหน่งวีดิโอในรายการ + แสดงตำแหน่งวีดิโอที่เล่นในรายการ + ล้างข้อมูล + \ No newline at end of file diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index b9b1cb24b0b..1d5a3fba60a 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -1,9 +1,9 @@ - Başlamak için aramaya dokun + Başlamak için aramaya dokunun %1$s görüntüleme Yayınlanma: %1$s - Akış oynatıcısı bulunamadı. VLC\'yi yüklemek istiyor musunuz\? + Akış oynatıcısı bulunamadı. VLC\'yi yüklemek ister misiniz\? Yükle İptal et Tarayıcıda aç @@ -17,25 +17,25 @@ döndürme Harici video oynatıcı kullanın Harici ses oynatıcı kullanın - Video indirme konumu - İndirilen videoları saklamak için konum - Video indirme konumunu giriniz - Ses indirme klasörü - İndirilen sesler burada depolanır - Ses dosyaları için indirme konumunu giriniz + Video indirme dizini + İndirilen video dosyaları burada depolanır + Video dosyaları için indirme dizinini seçin + Ses indirme dizini + İndirilen ses dosyaları burada depolanır + Ses dosyaları için indirme dizinini seçin Otomatik oynat NewPipe başka bir uygulamadan çağrıldığında bir video oynatır Varsayılan çözünürlük Kodi ile oynat Kore uygulaması bulunamadı. Yüklensin mi\? \"Kodi ile oynat\" seçeneğini göster - Kodi medya merkezi üzerinden video oynatmak için bir seçenek görüntüleyin - Varsayılan ses biçimi + Kodi ortam merkezi üzerinden video oynatmak için bir seçenek görüntüleyin + Varsayılan ses formatı Tema Koyu Açık İndir - "Sonraki " + Sonraki \'Sonraki\' ve \'Benzer\' videoları göster Desteklenmeyen URL Varsayılan içerik dili @@ -43,7 +43,7 @@ Video ve ses Görünüm Diğer - Arka planda oynatıyor + Arka planda oynatılıyor Oynat İçerik Yaş kısıtlamalı içerik @@ -54,32 +54,32 @@ Hata bildirimi Hata Ağ hatası - Tüm küçük resimler yüklenemedi + Küçük resimlerin tamamı yüklenemedi Video URL imzasının şifresi çözülemedi Web sitesi ayrıştırılamadı Web sitesi tamamen ayrıştırılamadı - İçerik kullanılamıyor + İçerik mevcut değil Canlı akışlar henüz desteklenmiyor Herhangi bir akış alınamadı Görüntü yüklenemedi Uygulama/kullanıcı arayüzü çöktü Üzgünüz, bu olmamalıydı. - Hatayı e-postay aracılığıyla bildir + Hatayı e-posta aracılığıyla bildir Üzgünüz, bazı hatalar oluştu. BİLDİR Bilgi: Ne oldu: Ne:\\nİstek:\\nİçerik Dili:\\nHizmet:\\nGMT Zamanı:\\nPaket:\\nSürüm:\\nİşletim sistemi sürümü: - Video ön izleme küçük resmi + Videoyu oynat, süre: Yükleyicinin avatar küçük resmi Beğeni Beğenmeme Tor kullanın - (Deneysel) Artırılmış gizlilik için indirme trafiğini Tor\'dan geçmesi için zorla (video yayımlama henüz desteklenmemektedir). - Bir hata bildir + (Deneysel) Artırılmış gizlilik için indirme trafiğini Tor\'dan geçmesi için zorlayın (video yayımlama henüz desteklenmemektedir). + Hata Bildirin Kullanıcı raporu İndirme dizini \'%1$s\' oluşturulamıyor - İndirme dizini oluşturuldu \'%1$s\' + İndirme dizini \'%1$s\' oluşturuldu Video Ses Yeniden dene @@ -101,16 +101,16 @@ Ayrıntılar için dokunun Lütfen bekleyin… Panoya kopyalandı - Lütfen uygun bir indirme klasörü seçin + Lütfen daha sonra ayarlardan uygun bir indirme dizini belirleyin İndirme menüsü ayarlanamadı - Açılır pencere kipinde aç - NewPipe açılır pencere kipi + Açılır pencere modunda aç + NewPipe açılır pencere modu Varsayılan açılır pencere çözünürlüğü Yüksek çözünürlükleri göster - Sadece bazı cihazlar 2K/4K video oynatmayı destekliyor - Varsayılan video biçimi + Sadece bazı cihazlar 2K/4K video oynatmayı desteklemektedir + Varsayılan video formatı Siyah - Açılır pencere kipinde oynatılıyor + Açılır pencere modunda oynatılıyor Tümü Kanal Evet @@ -119,26 +119,26 @@ Yorumunuz (İngilizce): Ayrıntılar: Video ön izleme küçük resmi - B + K M - MR - Bu izin, açılır pencere kipinde + B + Bu izin, açılır pencere modunda \naçmak için gereklidir reCAPTCHA - reCAPTCHA mücadelesi - reCAPTCHA mücadelesi istendi + reCAPTCHA formu + reCAPTCHA formu istendi Arka plan Açılır pencere Filtrele Yenile Temizle Açılır pencere boyutunu ve konumunu hatırla - Açılan pencerenin son boyutunu ve konumunu hatırlar + Açılan pencerenin son boyutunu ve konumunu hatırla Açılır pencere - Boyutlandırılıyor + Yeniden boyutlandırılıyor BAZI çözünürlüklerde ses kaldırılır Oynatıcının parlaklığını ve sesini kontrol etmek için hareketleri kullanın - Oynatıcı hareket kontrolü + Hareketli oynatıcı kontrolü Arama önerileri Arama yaparken önerileri göster En iyi çözünürlük @@ -152,21 +152,21 @@ Hakkında Katkıda bulunanlar Lisanslar - Libre, Android\'de hafif bir oynatıcı. - GitHub\'da gör + Android\'de özgür ve hafif bir oynatıcı. + GitHub\'da görüntüle NewPipe\'ın Lisansı Fikirleriniz; çeviri, tasarım değişiklikleri, kod temizliği ya da gerçek köklü kod değişikleri olsun yardımınıza her zaman açığız. Ne kadar çok yapılırsa o kadar iyi olur! Lisansı oku - Katkıda bulun + Katkıda bulunun İndir Dosya adlarında izin verilen karakterler Geçersiz karakterler bu değer ile değiştirilir Değiştirme karakteri Harfler ve rakamlar - En özel karakterler + Çoğu özel karakterler Abone ol - Abone - Kanal aboneliğinden çıktınız + Abone olundu + Kanal aboneliğinden çıkıldı Abonelik değiştirilemedi Abonelik güncellenemedi Ana @@ -174,15 +174,15 @@ Yenilikler Arama geçmişi Arama sorgularını yerel olarak saklayın - Geçmiş ve önbellek - İzlenen videoları takip edin + İzleme geçmişi + İzlenen videoların kaydını tutun Odaklanıldığında sürdür Kesintilerden sonra (örneğin telefon çağrısı) oynatmaya devam et Oynatıcı Davranış Geçmiş ve önbellek Oynatma Listesi - Geri Al + Geri al NewPipe Bildirimi NewPipe arka plan ve açılır pencere oynatıcıları için bildirimler Sonuç yok @@ -198,10 +198,6 @@ %s görüntüleme Video yok - - Video - Video - Geçmiş Aranan İzlenen @@ -210,11 +206,11 @@ Geçmiş boş Geçmiş temizlendi Öge silindi - Bu içeriği arama geçmişinden silmek istiyor musunuz\? + Bu ögeyi arama geçmişinden silmek istiyor musunuz\? \"Eklemek için basılı tutun\" ipucunu göster - Video ayrıntıları sayfasında arka plan veya açılır pencere düğmesine basıldığında ipucu gösterilir - Arka plan oynatıcı kuyruğuna eklendi - Açılır pencere oynatıcısı kuyruğa eklendi + Vidyo ayrıntıları sayfasında arka plan veya açılır pencere düğmesine basıldığında ipucu gösterilir + Arka plan oynatıcısı kuyruğuna eklendi + Açılır pencere oynatıcısı kuyruğuna eklendi Tümünü Oynat [Bilinmeyen] Bu akış oynatılamadı @@ -224,40 +220,40 @@ Boş Sayfa Kiosk Sayfası Abonelik Sayfası - Besleme Sayfası + Yayın Sayfası Kanal Sayfası Kanal seçin Henüz kanal aboneliği yok - Köşk seç - Köşk + Kiosk seçin + Kiosk Popüler En iyi 50 - En yeniler + En yeniler ve popülerler Arkaplan oynatıcı - Açılır oynatıcı + Açılır pencere oynatıcı Kaldır Ayrıntılar Ses Ayarları Kuyruğa eklemek için basılı tutun Arka planda kuyruğa ekle - Yeni açılan oynatıcıda kuyruğa al + Yeni açılır pencerede kuyruğa ekle Burada oynatmaya başla - Burada arka planda başlat - Burada yeni açılır oynatıcıda başlat - Bağış yapın - NewPipe, size en iyi deneyimi getiren zaman harcama gönüllüler tarafından geliştirilmiştir. Bir fincan kahvenin tadını çıkarırken geliştiricilerin New Pipe\'ı daha iyi hale getirmelerine yardımcı olun. - Bağış yap + Arka planda oynatmayı başlat + Yeni açılır pencerede oynatmayı başlat + Bağışta bulunun + NewPipe, size en iyi deneyimi sunmak için zaman harcayan gönüllüler tarafından geliştirilmiştir. Geliştiricilerin bir fincan kahvenin tadını çıkarırken NewPipe\'ı daha iyi hale getirmelerine yardımcı olun. + Bağışta bulunun Web sitesi Daha çok bilgi ve haber için NewPipe web sitesini ziyaret edin. Varsayılan içerik ülkesi Hizmet - Yönlendirmeyi değiştir - Arka plana geç - Açılır pencereye geç - Ana görünüme geç - Çekmeceyi aç - Çekmeceyi kapat - Akış oynatıcı bulunamadı (Bunu oynamak için VLC yükleyebilirsiniz). + Yönlendirmeyi Değiştir + Arka Plana Geç + Açılır Pencereye Geç + Ana Görünüme Geç + Çekmeceyi Aç + Çekmeceyi Kapat + Akış oynatıcı bulunamadı (Oynatmak için VLC yükleyebilirsiniz). Her Zaman Yalnızca Bir Kez Harici oynatıcılar bu tür bağlantıları desteklemez @@ -266,7 +262,7 @@ Ses akışı bulunamadı Video oynatıcı Arka plan oynatıcı - Açılır oynatıcı + Açılır pencere oynatıcı Bilgi alınıyor… İstenen içerik yükleniyor Veri tabanını içe aktar @@ -280,7 +276,7 @@ Bu, var olan kurulumunuzu geçersiz kılacaktır. Akış dosyasını indir Bilgi göster - Yer İmlenen Oynatma Listeleri + Yer İmlerine Eklenen Oynatma Listeleri Ekle Yeniden düzenlemek için sürükleyin Oluştur @@ -288,7 +284,7 @@ Tümünü Sil Reddet Yeniden adlandır - Bu ögeyi izleme geçmişinden silmek ister misiniz\? + Bu ögeyi izleme geçmişinden silmek istiyor musunuz\? Tüm ögeleri geçmişten silmek istediğinize emin misiniz\? Son Oynatılan En Çok Oynatılan @@ -299,43 +295,38 @@ Ad Oynatma Listesine Ekle Oynatma listesi küçük resmi olarak ayarla - Oyn. listesini imle + Oynatma listesini yer imlerine ekle Yer imini kaldır Bu oynatma listesi silinsin mi\? Oynatma listesi oluşturuldu - Oynatma listesinde + Oynatma listesine eklendi Oynatma listesinin küçük resmi değiştirildi. Oynatma listesi silinemedi. Altyazı yok Sığdır Doldur Yakınlaştır - Alt yazı boyutu - Daha küçük yazı tipi - Normal yazı tipi - Daha büyük yazı tipi Hata ayıklama Yakında bir şeyler burada görünecek ;D - Kendiliğinden Oluşturulan + Kendiliğinden oluşturulan LeakCanary\'i etkinleştir Bellek sızıntısı izleme, yığın boşaltımı sırasında uygulamanın yanıt vermemesine neden olabilir - Yaşam dışı döngü hatalarını bildir + Yaşam döngüsü dışı hatalarını bildir Parçanın dışında veya atımdan sonraki etkinlik yaşam döngüsündeki teslim edilemeyen Rx beklentilerinin bildirimini zorla Hızlı isabetsiz konumlama kullan İsabetsiz konumlama, oynatıcının daha düşük hassasiyetle daha hızlı pozisyon aramasını sağlar Sonraki akışı otomatik kuyruğa ekle - Yinelenmeyen bir kuyruktaki son akışı oynatırken ilgili akışı otomatik ekler. - EŞZAMANLA + Yinelenmeyen bir kuyruktaki son akışı oynatırken, ilgili bir akışı otomatik olarak ekle Dosya Böyle bir dizin yok - Dosya/içerik kaynağı değil - Dosya yok ya da okuma veya yazma izni yok + Böyle bir dosya/içerik kaynağı yok + Dosya yok ya da okuma veya yazma izni bulunmuyor Dosya adı boş olamaz Hata oluştu: %1$s İçe/dışa aktar İçe aktar Şuradan içe aktar - Şuna dışa aktar + Şuraya dışa aktar İçe aktarılıyor… Dışa aktarılıyor… Dosyayı içe aktar @@ -346,10 +337,10 @@ \n \n1. Şu adrese gidin: %1$s \n2. Sorulduğunda hesabınıza giriş yapın -\n3. İndirme başlamalı (bu, dışa aktarılmış dosyadır) - URL\'yi veya ID\'nizi yazarak SoundCloud profilini içe aktarın: +\n3. İndirme başlamalı (bu, dışa aktarma dosyasıdır) + URL\'yi veya ID\'nizi yazarak SoundCloud profilini içe aktarın: \n -\n1. Web tarayıcısında \"masaüstü kipi\" etkinleştirin (site, mobil aygıtlar için uygun değildir) +\n1. Web tarayıcısında \"masaüstü modu\" etkinleştirin (site, mobil aygıtlar için mevcut değildir) \n2. Şu adrese gidin: %1$s \n3. Sorulduğunda giriş yapın \n4. Yönlendirildiğiniz profil URL\'sini kopyalayın. @@ -360,25 +351,24 @@ Küçük resimleri yükle Küçük resimlerin yüklenmesini önlemek, veri ve hafıza kullanımından tasarruf etmek için kapatın. Değişiklikler, hem bellek içi hem de diskteki görüntü önbelleğini temizler. Görüntü önbelleği silindi - Önbelleğe alınmış meta verilerini temizle + Önbelleğe alınmış üstverileri temizle Önbelleğe alınmış tüm web sayfası verilerini kaldır - Üst veri önbelleği temizlendi + Üstveri önbelleği temizlendi Oynatım Hızı Denetimleri Hız Öntanımlı - Ses titreşimi + Ses yüksekliği Bağlantısız (bozulmaya neden olabilir) - Nightcore İndirilebilecek akış yok Tercih edilen \'aç\' eylemi - İçerik açılırken öntanımlı eylem — %s - Açıklamalar - Oynatıcı altyazı metin ölçeğini ve arka plan biçiimini değiştirin. Etkili olması için uygulama yeniden başlatma gerektirir. - Bu dosyayı oynatmak için uygulama yüklü değil + İçerik açılırken varsayılan eylem — %s + Altyazılar + Oynatıcı altyazı metin ölçeğini ve arka plan biçimini değiştirin. Etkili olması için uygulamayı yeniden başlatma gerektirir. + Bu dosyayı oynatmak için herhangi bir uygulama yüklü değil İzleme geçmişini temizle - Oynatılan akışların geçmişini siler + Oynatılan akışların geçmişini ve kalınan oynatım konumlarını siler İzleme geçmişinin tamamı silinsin mi\? - İzleme geçmişi silindi. + İzleme geçmişi silindi. Arama geçmişini temizle Aramada kullanılan anahtar kelimelerin geçmişini siler Tüm arama geçmişi silinsin mi\? @@ -400,27 +390,27 @@ Ana video oynatıcıdan diğer uygulamaya geçiş yaparken eylem — %s Yok Arka plan oynatıcısını küçült - Açılır oynatıcıya küçült + Açılır pencere oynatıcına küçült Sessizlik sırasında hızlı ileri Adım Sıfırla - Kanal - Oynatma Listesi - Parça - Kullanıcı + Kanallar + Oynatma Listeleri + Parçalar + Kullanıcılar Abonelikten çık Yeni Sekme Sekmeyi Seçin - Ses hareketi kontrolü + Hareketli ses kontrolü Oynatıcının sesini kontrol etmek için hareketleri kullanın - Parlaklık hareket kontrolü + Hareketli parlaklık kontrolü Oynatıcının parlaklığını kontrol etmek için hareketleri kullanın Güncellemeler Dosya silindi Uygulama Güncelleme Bildirimi Yeni NewPipe sürümü için bildirimler Harici depolama kullanılamıyor - Harici SD karta indirmek henüz mümkün değil. İndirme klasörü konumu sıfırlansın mı\? + Harici SD karta indirmek mümkün değil. İndirme dizini konumu sıfırlansın mı\? Varsayılan sekmeleri kullanarak, kaydedilen sekmeleri okurken hata Varsayılanları geri yükle Varsayılanları geri yüklemek istiyor musunuz\? @@ -437,22 +427,22 @@ NewPipe Güncellemesi Var! İndirmek için dokunun Tamamlandı - durdurulmuş + durduruldu sırada son işlemler uygulanıyor Kuyruk - Sistem tarafından reddedilen işlem + İşlem sistem tarafından reddedildi İndirme başarısız İndirme bitti %s indirme bitti Benzersiz ad oluştur Üzerine yaz - Bu ada sahip indirilen bir dosya zaten var - Bu ad ile devam eden bir indirme var + Bu isme sahip indirilen bir dosya zaten var + Bu isim ile bir indirme süreci var Hatayı göster Kod Dosya oluşturulamıyor - Hedef klasör oluşturulamıyor + Hedef dizin oluşturulamıyor İzin sistem tarafından reddedildi Güvenli bağlantı başarısız Sunucu bulunamadı @@ -465,11 +455,52 @@ Tamamlanan indirmeleri temizle Beklemedeki %s transferinize İndirmeler\'den devam edin Durdur - Azami dene sayısı + Azami deneme sayısı İndirmeyi iptal etmeden önce maksimum deneme sayısı - Mobil veriye geçerken duraklat - Duraklatılamayan indirmeler yeniden başlatılacak + Kotalı bağlantılarda durdur + Bazı indirmelerin bekletilememesine rağmen mobil veriye geçerken kullanışlıdır Olaylar Konferanslar - Kadar + Beklemede + Yorumları göster + Yorumları göstermeyi durdurmak için devre dışı bırak + Otomatik oynat + + Yorum + Yorumlar + + Yorum yok + Yorumlar yüklenemedi + Kapat + Oynatımı sürdür + Son oynatım konumunu geri yükle + Oynatma listelerindeki konumlar + Oynatma listelerinde oynatım konumlarını göster + Veri temizleme + Oynatım konumları silindi. + Dosya taşındı veya silindi + Bu isimde bir dosya zaten bulunuyor + dosyanın üzerine yazılamaz + Bu isim ile bekleyen bir indirme var + NewPipe bu dosya üzerinde çalışırken kapandı + Aygıt üzerinde yer yok + İlerleme kaybedildi, çünkü dosya silinmiş + Bağlantı zaman aşımı + Emin misiniz\? + İndirme kuyruğunu sınırla + Aynı anda yalnızca bir indirme yürütülecek + İndirmeleri başlat + İndirmeleri duraklat + Nereye indirileceğini sor + Her indirme için nereye kaydedileceği sorulacak + Her indirme için nereye kaydedileceği sorulacak. +\nEğer bir harici SD karta indirmek istiyorsanız DEÇ\'i seçin + DEÇ\'i kullan + Depolama Erişimi Çerçevesi harici SD karta indirmelere izin verir. +\nNot: Bazı cihazlar uyumlu değildir + Oynatım konumlarını sil + Tüm oynatım konumlarını siler + Tüm oynatım konumları silinsin mi\? + Etkili olması için indirme dizinlerini değiştirin + Hizmeti değiştir, şu anda seçili olan: \ No newline at end of file diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 3dfd9618370..d86ce9a5033 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -16,30 +16,30 @@ обертання Використовувати зовнішній відеопрогравач Використовувати зовнішній аудіопрогравач - Місце збереження відеозаписів - Вкажіть шлях до теки для завантаження відео - Вкажіть шлях до теки для завантаження аудіо - Шлях до теки, де зберігатимуться завантажені відео - Тека для завантаженого аудіо - Завантажене аудіо зберігається тут + Папка для завантаження відео + Виберіть папку для завантаження відеофайлів + Виберіть папку для завантаження аудіофайлів + Шлях до папки з завантаженим відео + Папка для завантаження аудіо + Завантажені аудіофайли зберігаються тут Автоматичне програвання Програє відео коли NewPipe викликано з іншого застосунку Типова роздільна здатність Програти у Kodi Застосунок Kore не знайдено. Встановити його\? Показати опцію \"Програти у Kodi\" - Показати опцію програвання відео у медіацентрі Kodi + Показати опцію програвання відео у Kodi Аудіо Типовий формат аудіо Тема Темна Світла Завантажити - Наступне відео + Наступне Показувати \"Наступне\" і \"Схожі\" відео URL не підтримується Переважна мова контенту - Відео та Авдіо + Відео та Аудіо Зовнішній вигляд Інше Програвання у тлі @@ -80,7 +80,7 @@ Ваш коментар (англійською): Подробиці: Зображення відео перед його переглядом - Зображення відео перед його переглядом + Відтворити відео, тривалість: Використовувати Tor (Експериментально) Перенаправляти трафік через Tor для підвищення конфіденційності (трансляція відео ще не підтримується). Повідомити про помилку @@ -91,7 +91,7 @@ Повторити спробу тис. млн. - млрд. + млрд Почати Пауза Грати @@ -107,7 +107,7 @@ Подробиці Зачекайте… Скопійовано до буферу обміну - Оберіть доступну теку для завантажень + Вкажіть теку для завантажень пізніше у налаштуваннях Програвач потокового відео не знайдений (ви можете встановити VLC для програвання). Відкрити у віконному режимі Прибирає звук при ПЕВНИХ роздільних здатностях @@ -233,9 +233,9 @@ %s підписників - Відео - Відео - Відео + %s Відео + %s Відео + %s Відео Створити Видалити одне @@ -293,12 +293,12 @@ Програвач у тлі Програвач у вікні Видалити - Утримуйте, щоб додати до черги - Додати до черги при програванні у тлі - Додати до черги при програванні у вікні + Утримуйте, щоб додати в чергу + Додати до фону + Додати до вікна Розпочати програвання звідси - Розпочати звідси при програванні у тлі - Розпочати звідси при програванні у вікні + Розпочати програвання на фоні + Розпочати програванні у вікні Відкрити бічну панель Закрити бічну панель Незабаром тут щось з\'явиться ;D @@ -377,9 +377,9 @@ Зміна висоти тексту субтитрів та стилів тла. Потребує перезапуску застосунку. Не встановлено застосунків для програвання цього файлу Очистити історію переглядів - Видаляє історію відтворень + Видаляє історію відтворень і запам\'ятованих позицій Видалити всю історію переглядів\? - Історію переглядів видалено. + Історію переглядів видалено. Очистити історію пошуку Видаляє історію пошукових ключових слів Видалити всю історію пошуку\? @@ -436,7 +436,7 @@ Доступна нова версія NewPipe! Натисніть для завантаження Завершено - У черзі + Очікує призупинено додано в чергу пост-обробка @@ -452,8 +452,8 @@ Файл з такою назвою вже завантажується Показати помилку Код - Файл не може бути створений - Цільова тека не може бути створена + Цільова тека не може бути створена + Файл не може бути створений Доступ заборонено системою Захищене з\'єднання не встановлено Сервер не знайдено @@ -466,12 +466,48 @@ Зупинити Максимум спроб Максимальна кількість спроб перед скасуванням завантаження - Призупиняти завантаження при переході на стільникові дані - Завантаження до зовнішньої SD-карти поки що неможливе. Скинути розташування теки для завантажень\? + Переривати завантаження на небезлімітних з\'єднаннях + Завантаження до зовнішньої SD-карти неможливе. Скинути розташування теки для завантажень\? Помилка зчитування збережених вкладок. Використовую типові вкладки. Вкладки, що відображаються на головній сторінці Показувати сповіщення з пропозицією оновити застосунок за наявності нової версії Запитуваний діапазон неприпустимий Продовжити ваші %s відкладених переміщень із Завантажень - Завантаження, що не можуть бути призупинені, будуть перезапущені + Корисно під час переходу на мобільні дані, хоча деякі завантаження не можуть бути призупинені + Показувати коментарі + Вимнути відображення дописів + Автопрогравання + + Коментарі + + + + Коментарі відсутні + Не вдалося підвантажити коментарів + Закрити + Позиції відтворення видалено. + Файл переміщено або видалено + не можу перезаписати файл + Завантаження з таким ім\'ям вже є в черзі + NewPipe був закритий під час роботи над файлом + На пристрої не залишилося вільного місця + Прогрес втрачено через видалення файлу + Час очікування з\'єднання вичерпано + Ви впевнені\? + Обмежити чергу завантажень + В кожен момент часу виконуватиметься одне завантаження + Почати завантаження + Призупинити завантаження + Запитувати, куди завантажувати + Вас питатимуть, куди зберігати кожне завантаження + Вас питатимуть, куди зберігати кожне завантаження. +\nОберіть SAF, якщо бажаєте завантажувати на зовнішню SD-картку + Використовувати SAF + Storage Access Framework дає можливість завантажувати на зовнішню SD-карту. +\nЗверніть увагу: деякі пристрої є несумісними + Видалити запам\'ятовані позиції + Видаляє усі запам\'ятовані позиції + Видалити усі запам\'ятовані позиції\? + Змініть папки завантаження для ефективності + Перемкнути службу, наразі обрано: \ No newline at end of file diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml index c653cf6e634..07495895b6c 100644 --- a/app/src/main/res/values-ur/strings.xml +++ b/app/src/main/res/values-ur/strings.xml @@ -1,5 +1,6 @@ - -شروع کرنے کیلئے تلاش کو ٹپ کریں + + + شروع کرنے کیلئے تلاش کو ٹپ کریں ملاحظات کوشائع ہوا انسٹال @@ -7,16 +8,21 @@ بانٹیں ڈاؤن لوڈکریں تلاش کریں - کیا آپ کا مطلب تھا + کیا آپ کا مطلب تھا: %1$s \? انٹرنیٹ میں کھولیں ترتیبات کوئیstream پلیئر نہیں ملا.کیا آپ VLC انسٹال کرنا چاہتے ہیں؟ - کوئیstream پلیئر نہیں ملا.(آپ VLC انسٹال کر سکتے ہیے) + کوئیstream پلیئر نہیں ملا(آپ VLC انسٹال کر سکتے ہیے)۔ PopUp موڈ میں کھولیں - سٹریم فائل ڈاؤن لوڈ کریں. + سٹریم فائل ڈاؤن لوڈ کریں کے ساتھ بانٹیں Internet Browser منتخب کریں \n rotation کرو external video player استعمال کریں - + SOME قرارداد پر آواز ہٹا دے گا + بیرونی سوتی عامل ایپ استعمال کریں + NewPipe ابھاری اسلوب + سبسکرائیب کریں + سبسکرائیب کر لیا + \ No newline at end of file diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml index 33781230db5..74b8b395c76 100644 --- a/app/src/main/res/values-vi/strings.xml +++ b/app/src/main/res/values-vi/strings.xml @@ -12,20 +12,20 @@ Tải về Tìm kiếm Cài đặt - Ý của bạn là %1$s\? + Ý của bạn là: %1$s\? Chia sẻ với Chọn trình duyệt Sử dụng trình phát video bên ngoài - Âm thanh có thể không có ở *một vài* độ phân giải video + Loại bỏ âm thanh trên *MỘT SỐ* độ phân giải video Sử dụng trình phát audio bên ngoài Chế độ popup của NewPipe Trình phát nổi - Thư mục tải về video - Đường dẫn để lưu video đã tải về - Nhập đường dẫn tải về cho video + Thư mục video tải về + Video đã tải về được lưu ở đây + Chọn vị trí lưu video tải về Thư mục tải về audio Audio đã tải về được lưu ở đây - Nhập đường dẫn tải về cho audio + Chọn vị trí lưu audio tải về Tự động phát Phát video khi NewPipe được gọi từ một ứng dụng khác Độ phân giải mặc định @@ -45,13 +45,13 @@ Tối Đen Nhớ kích thước và vị trí của popup - Nhớ kích thước và vị trí cuối của popup + Nhớ kích thước và vị trí lần trước của popup Điều khiển cử chỉ trình phát Sử dụng cử chỉ để kiểm soát độ sáng và âm lượng của trình phát Đề xuất tìm kiếm Hiển thị các đề xuất khi tìm kiếm Tải về - Tiếp + Tiếp theo Hiển thị video \"Tiếp theo\" và \"Tương tự\" URL không được hỗ trợ Hiển thị @@ -78,7 +78,7 @@ Độ phân giải tốt nhất Lỗi Lỗi kết nối mạng - Không thể tải tất cả các thumbnails + Không thể tải tất cả hình thu nhỏ Không thể giải mã chữ ký URL video Không thể phân tích cú pháp trang web Không thể phân tích cú pháp hoàn toàn trang web @@ -132,7 +132,7 @@ Chạm để biết chi tiết Vui lòng đợi … Sao chép vào clipboard - Chọn một thư mục tải về có sẵn + Chọn một thư mục tải về có sẵn trong cài đặt Cần quyền này để \nmở trong chế độ popup ReCAPTCHA @@ -158,7 +158,7 @@ Ngôn ngữ nội dung ưu tiên Video & âm thanh Trình phát nổi - Lịch sử & bộ nhớ cache + Lịch sử xem Lịch sử & bộ nhớ cache Playlist Không tìm thấy @@ -170,13 +170,13 @@ Không tìm thấy trình phát luồng nào (bạn có thể cài đặt VLC để phát). Tải về tệp luồng Hiển thị thông tin - main + Trang chủ Đăng ký - Playlist đã đánh dấu + Danh sách phát được đánh dấu Có gì mới Thêm vào Sử dụng tìm kiếm nhanh không chính xác - Tìm kiếm không chính xác cho phép trình phát tua đến vị trí nhanh hơn với độ chính xác bị hạn chế + Tìm kiếm không chính xác cho phép trình phát tìm đến vị trí nhanh hơn với độ chính xác bị hạn chế Tải hình thu nhỏ Tắt để không tải về các hình thu nhỏ, tiết kiệm lưu lượng mạng và bộ nhớ. Thay đổi điều này sẽ xóa bộ nhớ đệm hình ảnh cả trong RAM và trong bộ nhớ. Đã xóa bộ nhớ cache hình ảnh @@ -184,7 +184,7 @@ Xóa tất cả dữ liệu trang web được lưu trong bộ nhớ cache Đã xóa bộ nhớ cache siêu dữ liệu Tự động phát tiếp theo theo hàng - Tự động thêm một luồng có liên quan khi phát luồng cuối cùng trong hàng đợi không lặp lại. + Tự động thêm một luồng có liên quan khi phát luồng cuối cùng trong hàng đợi không lặp lại Lịch sử tìm kiếm Lưu trữ truy vấn tìm kiếm cục bộ Theo dõi các video đã xem @@ -220,9 +220,9 @@ Ghi đè lịch sử và danh sách đăng ký hiện tại của bạn Xuất lịch sử, đăng ký và playlist Xóa lịch sử xem - Xóa lịch sử của các luồng đã phát + Xóa lịch sử các luồng đã phát và vị trí phát Xóa toàn bộ lịch sử xem\? - Đã xóa lịch sử xem. + Đã xóa lịch sử xem. Xóa lịch sử tìm kiếm Xóa lịch sử của từ khóa tìm kiếm Xóa toàn bộ lịch sử tìm kiếm\? @@ -252,7 +252,7 @@ Không có video nào - Video + %s video Tạo nên Xóa một @@ -315,10 +315,10 @@ Cài đặt âm thanh Giữ để nối tiếp Thêm vào trình phát nền - Thêm vào trình phát popup + Thêm vào trình phát popup mới Bắt đầu phát ở đây - Bắt đầu từ đây trong nền - Bắt đầu từ đây trên trình phát popup + Bắt đầu phát từ đây trong nền + Bắt đầu phát từ đây trên trình phát popup mới Mở ngăn kéo Đóng ngăn Một cái gì đó sẽ xuất hiện ở đây sớm ;D @@ -409,7 +409,7 @@ Thông báo cập nhật ứng dụng Thông báo phiên bản NewPipe mới Bộ nhớ ngoài không khả dụng - Hiện tại chưa thể tải vào thẻ SD ngoài. Đặt lại vị trí tải về\? + Không thể tải vào thẻ SD ngoài. Đặt lại vị trí tải về\? Khôi phục lại các tab mặc định do danh sách các tab đã lưu không hợp lệ Khôi phục về mặc định Bạn có muốn khôi phục về mặc định\? @@ -457,9 +457,45 @@ Dừng Số lượt thử lại tối đa Số lượt thử lại trước khi hủy tải về - Tạm dừng tải khi chuyển qua dữ liệu di động - Các tải về không thể tạm dừng được sẽ bắt đầu lại từ đầu + Tạm dừng tải khi trên dữ liệu di động + Hữu ích khi chuyển sang dữ liệu di động, nhưng một số tải xuống không thể bị đình chỉ Đang chờ xử lý Hội thảo Mã + Hiện nhận xét + Vô hiệu hoá để dừng nhận xét xuất hiện + Tự động phát + + Nhận xét + + Không có nhận xét + Không thể tải nhận xét + Đóng + Tiếp tục phát + Phục hồi vị trí phát lại + Vị trí phát trong danh sách + Hiện vị trí phát lại trong danh sách + Xoá dữ liệu + Đã xoá vị trí phát lại. + Tệp đã di chuyển hoặc đã xoá + Tên file này đã tồn tại + Không thể ghi đè lên tệp + Có một bản tải xuống đang chờ xử lí với tên này + Newpipe đã bị đóng khi đang xử lí tệp + Không đủ dung lượng trên máy + Quá trình mất, vì tập tin đã bị xoá + Kết nối hết thời gian + Bạn có chắc không\? + Giới hạn hàng chờ tải xuống + Chỉ một tải xuống sẽ chạy + Bắt đầu tải xuống + Tạm dừng tải xuống + Hỏi vị trí tải xuống + Bạn sẽ được hỏi vị trí lưu mỗi lần tải xuống + Bạn sẽ được hỏi vị trí lưu mỗi lần tải xuống. +\nBật tính năng này nếu bạn muốn tải xuống sang thẻ SD ngoài. + Xóa vị trí phát + Xóa toàn bộ vị trí phát + Xác nhận xóa toàn bộ vị trí phát\? + Thay đổi vị trí lưu để áp dụng \ No newline at end of file diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 0b9241f7552..9aa4b92452d 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -383,10 +383,6 @@ 放大填充 自动生成 - 字幕字体大小 - 小字体 - 中等字体 - 大字体 启用 LeakCanary 内存泄露监测可能会在heap dumping时导致应用失去响应 @@ -426,7 +422,6 @@ 速度 音调 Unhook（可能导致失真） - Nightcore 默认 未安装能播放此文件的应用 @@ -436,7 +431,7 @@ 清除观看记录 删除视频观看记录 删除全部观看记录。 - 观看记录已删除。 + 观看记录已删除。 清除搜索记录 删除搜索关键词记录 删除全部搜索记录。 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 15023071c3b..7e7eaf1c4b5 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -16,9 +16,9 @@ 旋轉 使用外部影片播放器 使用外部音訊播放器 - 影片下載路徑 - 已下載影片的存放路徑 - 輸入影片下載路徑 + 影片下載資料夾 + 已下載的影片檔案會儲存在這裡 + 選擇影片檔的下載資料夾 預設解析度 用 Kodi 播放 顯示用 Kodi 媒體中心播放影片的選項 @@ -30,7 +30,7 @@ 灰暗 明亮 下載 - 下一部 + 下一個 顯示「下一部」與「相關」的影片 不支援此網址 預設內容語言 @@ -41,15 +41,15 @@ 播放 網路錯誤 影片預覽縮圖 - 影片預覽縮圖 + 播放影片，持續時間： 發佈者的個人頭像縮圖 喜歡 不喜歡 使用 Tor (實驗性) 強迫下載流量繞經 Tor 以加強隱私 (暫未支援串流影片)。 音訊下載資料夾 - 已下載的音訊存放存儲在這裡\t - 輸入音訊檔案的下載路徑 + 已下載的音訊檔案會儲存在這裡 + 選擇音訊檔的下載資料夾 無法建立下載目錄「%1$s」 已建立下載目錄「%1$s」 輕觸搜尋按鈕開始使用 NewPipe @@ -114,9 +114,9 @@ 音訊 重試 無法存取儲存空間 - 千 + K 百萬 - 十億 + B 開始 暫停 播放 @@ -134,7 +134,7 @@ 輕觸以顯示詳細資訊 請稍候… 已複製至剪貼簿 - 請選擇下載資料夾 + 稍後請在設定中選擇下載資料夾 使用懸浮視窗模式需要此權限 reCAPTCHA 驗證 reCAPTCHA 驗證 @@ -151,7 +151,7 @@ 新鮮事 搜尋紀錄 在本機儲存搜尋紀錄 - 歷史紀錄與快取 + 檢視歷史 記錄觀看過的影片 取得視窗焦點時繼續播放 在干擾結束後繼續播放（例如有來電） @@ -173,9 +173,6 @@ %s 次觀看 沒有影片 - - 影片 - 下載 檔案名稱中允許的字元 不符合設定的字元將會被替換為此字串 @@ -260,11 +257,11 @@ 移除 詳細資訊 音訊設定 - 當背景時佇列 - 在新懸浮視窗時佇列 + 在背景加入佇列 + 在新的彈出式視窗中加入佇列 從這裡開始播放 - 當背景時從這裡開始 - 懸浮視窗時從這裡開始 + 在背景開始播放 + 在新彈出式視窗中開始播放 長按以新增至佇列 NewPipe 由志願者所開發，他們耗費時間務求為您帶來最佳體驗。現在是時候回過頭來，讓我們的開發人員能夠在使 NewPipe 更臻完美的同時，享受一杯咖啡。 打開抽屜 @@ -306,10 +303,6 @@ 合適的 填滿 縮放 - 標題字體大小 - 縮小字體 - 正常字體 - 加大字體 某些東西即將在此出現 ;D 除錯 自動產生 @@ -320,8 +313,7 @@ 使用粗略但快速的尋找 粗略的尋找能讓播放器以降低的精確度更快找到影片的進度位置 自動將下一部影片新增至佇列 - 在非重複播放佇列中最後一個串流開始播放時，自動新增相關串流。 - 同步 + 在非重複播放佇列中最後一個串流開始播放時，自動新增相關串流 檔案 無效的資料夾 無效的檔案/內容來源 @@ -363,7 +355,6 @@ 節奏 音高 解除連結（可能導致失真） - Nightcore 預設 偏好的「開啟」動作 開啟內容時的預設動作 — %s @@ -372,9 +363,9 @@ 調整播放器字幕文字大小與背景樣式。必須重新啟動應用程式才會生效。 未安裝可播放此檔案的應用程式 清除觀看歷史 - 刪除播放過的串流歷史 + 刪除播放過的串流與播放位置歷史 刪除所有觀看歷史記錄？ - 觀看歷史已刪除。 + 觀看歷史已刪除。 清除搜尋歷史 刪除搜尋關鍵字的歷史 刪除所有搜尋歷史記錄？ @@ -416,7 +407,7 @@ 應用程式更新通知 新 NewPipe 版本通知 外部儲存不可用 - 目前無法下載到外部 SD 卡。重設下載資料夾位置？ + 無法下載到外部 SD 卡。重設下載資料夾位置？ 使用預設分頁，讀取已儲存的分頁時發生錯誤 恢復預設值 您想要恢復預設值嗎？ @@ -464,9 +455,48 @@ 停止 最大重試次數 在取消下載前的最大嘗試數 - 切換到行動數據時暫停 - 無法暫停的下載將會重新開始 + 在計量收費網路上時中斷 + 在切換到行動數據時很有用（雖然某些下載無法暫停） 事件 會議 連接超時 + 顯示留言 + 停用以停止顯示留言 + 自動播放 + + 留言 + + 沒有留言 + 無法載入留言 + 關閉 + 恢復播放 + 回復到上一次播放的位置 + 清單中的位置 + 在清單中顯示播放位置指示器 + 清除資料 + 播放位置已刪除。 + 檔案已移動或已刪除 + 與此同名的檔案已存在 + 無法覆寫檔案 + 有同名的擱置中下載 + NewPipe 在處理檔案時被關閉 + 裝置上沒有剩餘的空間 + 進度遺失，因為檔案已被刪除 + 您確定？ + 限制下載佇列 + 一次執行一個下載 + 開始下載 + 暫停下載 + 詢問要下載到哪裡 + 每次下載您都會被詢問要下載到哪裡 + 每次下載您都會被詢問要下載到哪裡。 +\n如果您想要下載到外部的 SD 卡的話，請選擇 SAF + 使用 SAF + 儲存存取框架讓您可以下載到外部的 SD 卡。 +\n注意：可能與某些裝置不相容 + 刪除播放位置 + 刪除所有播放位置 + 刪除所有播放位置？ + 變更下載資料夾以使其生效 + 切換服務，目前已選取： \ No newline at end of file diff --git a/app/src/main/res/values/settings_keys.xml b/app/src/main/res/values/settings_keys.xml index f75f38c771f..f99e9a9575b 100644 --- a/app/src/main/res/values/settings_keys.xml +++ b/app/src/main/res/values/settings_keys.xml @@ -154,16 +154,18 @@ enable_playback_resume enable_playback_state_lists - import_data - export_data + import_data + export_data download_thumbnail_key cache_wipe_key clear_play_history + clear_playback_states clear_search_history downloads_storage_ask + storage_use_saf file_rename_charset diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 87b88b0db29..42e0cd4f87e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -41,12 +41,13 @@ Background Popup Add To - Video download path - Path to store downloaded videos in - Enter download path for videos + Video download folder + Downloaded video files are stored here + Choose the download folder for video files Audio download folder - Downloaded audio is stored here - Enter download path for audio files + Downloaded audio files are stored here + Choose the download folder for audio files + Change the download folders to take effect Autoplay Plays a video when NewPipe is called from another app Default resolution @@ -99,7 +100,7 @@ Resume on focus gain Continue playing after interruptions (e.g. phone calls) Download - Up next + Next Autoplay Show \'Next\' and \'Similar\' videos Show \"Hold to append\" tip @@ -178,9 +179,13 @@ Overrides your current history and subscriptions Export history, subscriptions and playlists Clear watch history - Deletes the history of played streams + Deletes the history of played streams and the playback positions Delete entire watch history? - Watch history deleted. + Watch history deleted. + Delete playback positions + Deletes all playback positions + Delete all playback positions? + Playback positions deleted. Clear search history Deletes history of search keywords Delete entire search history? @@ -230,7 +235,7 @@ Details: Video preview thumbnail - Video preview thumbnail + Play video, duration: Uploader\'s avatar thumbnail Likes Dislikes @@ -252,6 +257,7 @@ K M B + Toggle service, currently selected: No subscribers @@ -266,10 +272,9 @@ No videos - Video - Videos - - + %s video + %s videos + No comments %s comment @@ -305,7 +310,7 @@ Tap for details Please wait… Copied to clipboard - Please select an available download folder + Please define a download folder later in settings This permission is needed to\nopen in popup mode 1 item deleted. @@ -320,7 +325,6 @@ Allowed characters in filenames Invalid characters are replaced with this value Replacement character - Letters and digits Most special characters No app installed to play this file @@ -387,7 +391,6 @@ This will override your current setup. Do you want to also import settings? Could not load comments - Kiosk Trending @@ -401,14 +404,12 @@ Remove Details Audio Settings - Hold To enqueue - Play directly in background + Hold to enqueue Enqueue in the background Enqueue in a new popup Start playing here Start playing in the background Start playing in a new popup - Open Drawer Close Drawer @@ -548,7 +549,6 @@ cannot overwrite the file There is a download in progress with this name There is a pending download with this name - Show error Code @@ -567,7 +567,6 @@ No space left on device Progress lost, because the file was deleted Connection timeout - Clear finished downloads Are you sure? Continue your %s pending transfers from Downloads @@ -584,11 +583,9 @@ One download will run at the same time Start downloads Pause downloads - - Select the downloads save path - Ask where to download You will be asked where to save each download - You will be asked where to save each download.\nEnable this option if you want download to the external SD Card - + You will be asked where to save each download.\nChoose SAF if you want to download to an external SD card + Use SAF + The Storage Access Framework allows downloads to an external SD card.\nNote: some devices are not compatible diff --git a/app/src/main/res/xml/download_settings.xml b/app/src/main/res/xml/download_settings.xml index 7a6fab841c1..0df021842c7 100644 --- a/app/src/main/res/xml/download_settings.xml +++ b/app/src/main/res/xml/download_settings.xml @@ -12,6 +12,13 @@ android:summary="@string/downloads_storage_ask_summary_kitkat" android:title="@string/downloads_storage_ask_title" /> + + + + usedIds = new HashSet<>(); diff --git a/app/src/test/java/org/schabi/newpipe/settings/tabs/TabsJsonHelperTest.java b/app/src/test/java/org/schabi/newpipe/settings/tabs/TabsJsonHelperTest.java index c78b9c9b1ae..20785e54890 100644 --- a/app/src/test/java/org/schabi/newpipe/settings/tabs/TabsJsonHelperTest.java +++ b/app/src/test/java/org/schabi/newpipe/settings/tabs/TabsJsonHelperTest.java @@ -5,6 +5,7 @@ import com.grack.nanojson.JsonParser; import com.grack.nanojson.JsonParserException; +import org.junit.Ignore; import org.junit.Test; import java.util.Arrays; @@ -20,18 +21,19 @@ public class TabsJsonHelperTest { private static final String JSON_TABS_ARRAY_KEY = "tabs"; private static final String JSON_TAB_ID_KEY = "tab_id"; + @Ignore @Test public void testEmptyAndNullRead() throws TabsJsonHelper.InvalidJsonException { final String emptyTabsJson = "{\"" + JSON_TABS_ARRAY_KEY + "\":[]}"; List items = TabsJsonHelper.getTabsFromJson(emptyTabsJson); - // Check if instance is the same - assertTrue(items == TabsJsonHelper.FALLBACK_INITIAL_TABS_LIST); + assertTrue(!items.isEmpty()); final String nullSource = null; items = TabsJsonHelper.getTabsFromJson(nullSource); - assertTrue(items == TabsJsonHelper.FALLBACK_INITIAL_TABS_LIST); + assertTrue(!items.isEmpty()); } + @Ignore @Test public void testInvalidIdRead() throws TabsJsonHelper.InvalidJsonException { final int blankTabId = Tab.Type.BLANK.getTabId(); @@ -82,6 +84,7 @@ private boolean isTabsArrayEmpty(String returnedJson) throws JsonParserException return jsonObject.getArray(JSON_TABS_ARRAY_KEY).size() == 0; } + @Ignore @Test public void testSaveAndReading() throws JsonParserException { // Saving diff --git a/build.gradle b/build.gradle index a95f6dcc038..60a85021ae4 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.0' + classpath 'com.android.tools.build:gradle:3.4.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/fastlane/metadata/android/en-US/changelogs/750.txt b/fastlane/metadata/android/en-US/changelogs/750.txt new file mode 100644 index 00000000000..a2208452395 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/750.txt @@ -0,0 +1,23 @@ +New +Playback resume #2288 +• Resume streams where you stopped last time +Downloader Enhancements #2149 +• Use Storage Access Framework to store downloads on external SD-cards +• New mp4 muxer +• Optionally change the download directory before starting a download +• Respect metered networks + + +Improved +• Removed gema strings #2295 +• Handle (auto)rotation changes during activity lifecycle #2444 +• Make long-press menus consistent #2368 + +Fixed +• Fixed selected subtitle track name not being shown #2394 +• Do not crash when check for app update fails (GitHub version) #2423 +• Fixed downloads stuck at 99.9% #2440 +• Update play queue metadata #2453 +• [SoundCloud] Fixed crash when loading playlists TeamNewPipe/NewPipeExtractor#170 +• [YouTube] Fixed duration can not be paresd TeamNewPipe/NewPipeExtractor#177 + diff --git a/fastlane/metadata/android/en-US/changelogs/760.txt b/fastlane/metadata/android/en-US/changelogs/760.txt new file mode 100644 index 00000000000..66858f3adff --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/760.txt @@ -0,0 +1,44 @@ +Changes in 0.17.1 + +New +• Thai localization + + +Improved +• Add start playing here action in long-press menus for playlists again #2518 +• Add switch for SAF / legacy file picker #2521 + +Fixed +• Fix disappearing buttons in downloads view when switching apps #2487 +• Fix playback position is stored although watch history is disabled +• Fix reduced performance caused by playback position in list views #2517 +• [Extractor] Fix ReCaptchaActivity #2527, TeamNewPipe/NewPipeExtractor#186 +• [Extractor] [YouTube] Fix casual search error when playlists are in results TeamNewPipe/NewPipeExtractor#185 + + + +Changes in 0.17.0 + +New +Playback resume #2288 +• Resume streams where you stopped last time +Downloader Enhancements #2149 +• Use Storage Access Framework to store downloads on external SD-cards +• New mp4 muxer +• Optionally change the download directory before starting a download +• Respect metered networks + + +Improved +• Removed gema strings #2295 +• Handle (auto)rotation changes during activity lifecycle #2444 +• Make long-press menus consistent #2368 + +Fixed +• Fixed selected subtitle track name not being shown #2394 +• Do not crash when check for app update fails (GitHub version) #2423 +• Fixed downloads stuck at 99.9% #2440 +• Update play queue metadata #2453 +• [SoundCloud] Fixed crash when loading playlists TeamNewPipe/NewPipeExtractor#170 +• [YouTube] Fixed duration can not be paresd TeamNewPipe/NewPipeExtractor#177 + diff --git a/fastlane/metadata/android/en-US/changelogs/770.txt b/fastlane/metadata/android/en-US/changelogs/770.txt new file mode 100644 index 00000000000..439c6532b34 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/770.txt @@ -0,0 +1,4 @@ +Changes in 0.17.2 + +Fix +• Fix no video was available diff --git a/fastlane/metadata/android/en-US/changelogs/780.txt b/fastlane/metadata/android/en-US/changelogs/780.txt new file mode 100644 index 00000000000..9100d7335f0 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/780.txt @@ -0,0 +1,12 @@ +Changes in 0.17.3 + +Improved +• Added option to clear playback states #2550 +• Show hidden directories in the file picker #2591 +• Support URLs from `invidio.us` instances to be opened with NewPipe #2488 +• Add support for `music.youtube.com` URLs TeamNewPipe/NewPipeExtractor#194 + +Fixed +• [YouTube] Fixed 'java.lang.IllegalArgumentException #192 +• [YouTube] Fixed live streams not working TeamNewPipe/NewPipeExtractor#195 +• Fixed performance problem in android pie when downloading a stream #2592 diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000000..5465fec0eca --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +android.enableJetifier=true +android.useAndroidX=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 5084c008b36..e98d29bd811 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,8 +1,6 @@ -#Fri Mar 30 10:42:05 CEST 2018 +#Mon Oct 07 06:29:33 CEST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip -distributionSha256Sum=9af7345c199f1731c187c96d3fe3d31f5405192a42046bafa71d846c3d9adacb -#distributionSha256Sum must be updated along with the version of gradle in distributionUrl +distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip