lasers
/
NewPipe
mirror of https://github.com/TeamNewPipe/NewPipe
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Weblate 2018-04-01 22:41:06 +02:00
parent 7061f38abe a0f74e715a
commit 4baee67781
14 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/build.gradle
View File

@ -54,7 +54,8 @@ dependencies {
exclude module: 'support-annotations'
}
implementation 'com.github.TeamNewPipe:NewPipeExtractor:f787b375e5fb6d'
implementation 'com.github.TeamNewPipe:NewPipeExtractor:a6b6235644474'
testImplementation 'junit:junit:4.12'
testImplementation 'org.mockito:mockito-core:1.10.19'

2
app/src/main/java/org/schabi/newpipe/fragments/list/kiosk/KioskFragment.java
View File

@ -168,7 +168,7 @@ public class KioskFragment extends BaseListInfoFragment<KioskInfo> {
if (!result.getErrors().isEmpty()) {
showSnackBarError(result.getErrors(),
UserAction.REQUESTED_PLAYLIST,
UserAction.REQUESTED_KIOSK,
NewPipe.getNameOfService(result.getServiceId()), result.getUrl(), 0);
}
}

11
app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java
View File

@ -89,7 +89,8 @@ public class ErrorActivity extends AppCompatActivity {
private TextView errorMessageView;
public static void reportUiError(final AppCompatActivity activity, final Throwable el) {
reportError(activity, el, activity.getClass(), null, ErrorInfo.make(UserAction.UI_ERROR, "none", "", R.string.app_ui_crash));
reportError(activity, el, activity.getClass(), null,
ErrorInfo.make(UserAction.UI_ERROR, "none", "", R.string.app_ui_crash));
}
public static void reportError(final Context context, final List<Throwable> el,
@ -97,12 +98,8 @@ public class ErrorActivity extends AppCompatActivity {
if (rootView != null) {
Snackbar.make(rootView, R.string.error_snackbar_message, 15 * 1000)
.setActionTextColor(Color.YELLOW)
.setAction(R.string.error_snackbar_action, new View.OnClickListener() {
@Override
public void onClick(View v) {
startErrorActivity(returnActivity, context, errorInfo, el);
}
}).show();
.setAction(R.string.error_snackbar_action, v ->
startErrorActivity(returnActivity, context, errorInfo, el)).show();
} else {
startErrorActivity(returnActivity, context, errorInfo, el);
}

3
app/src/main/java/org/schabi/newpipe/report/UserAction.java
View File

@ -13,7 +13,8 @@ public enum UserAction {
GET_SUGGESTIONS("get suggestions"),
REQUESTED_STREAM("requested stream"),
REQUESTED_CHANNEL("requested channel"),
REQUESTED_PLAYLIST("requested playlist");
REQUESTED_PLAYLIST("requested playlist"),
REQUESTED_KIOSK("requested kiosk");
private final String message;

2
app/src/main/res/values-b+ast/strings.xml
View File

@ -122,7 +122,7 @@
<string name="msg_running">NewPipe baxando</string>
<string name="could_not_load_image">Nun pudo cargase la imaxe</string>
<string name="app_ui_crash">Cascó l\'aplicación/IU</string>
<string name="info_labels">Lo qu\'asocedió:\\nSolicitú:\\nLlingua del conteníu:\\nServiciu:\\nHora GMT:\\nPaquete:\\nVersión:\\nVersión del SO:\\nRangu global d\'IP:</string>
<string name="info_labels">Lo qu\'asocedió:\\nSolicitú:\\nLlingua del conteníu:\\nServiciu:\\nHora GMT:\\nPaquete:\\nVersión:\\nVersión del SO:</string>
<string name="open_in_popup_mode">Abrir en ventanu emerxente</string>
<string name="popup_mode_share_menu_title">Mou de ventanu emerxente de NewPipe</string>

2
app/src/main/res/values-de/strings.xml
View File

@ -78,7 +78,7 @@
<string name="error_snackbar_action">MELDEN</string>
<string name="what_device_headline">Info:</string>
<string name="what_happened_headline">Dies ist passiert:</string>
<string name="info_labels">Was:\\nAnfrage:\\nSprache des Inhalts:\\nDienst:\\nZeit (GMT):\\nPacket:\\nVersion:\\nOS-Version:\\nGlob. IP-Bereich:</string>
<string name="info_labels">Was:\\nAnfrage:\\nSprache des Inhalts:\\nDienst:\\nZeit (GMT):\\nPacket:\\nVersion:\\nOS-Version:</string>
<string name="error_details_headline">Details:</string>
<string name="video">Video</string>

2
app/src/main/res/values-es/strings.xml
View File

@ -125,7 +125,7 @@
<string name="could_not_load_image">No se pudo cargar la imagen</string>
<string name="app_ui_crash">La interfaz de la app dejó de funcionar</string>
<string name="info_labels">Lo sucedido:\\nSolicitud:\\nIdioma del contenido:\\nServicio:\\nHora GMT:\\nPaquete:\\nVersión:\\nVersión del S.O:\\nRango global de la IP:</string>
<string name="info_labels">Lo sucedido:\\nSolicitud:\\nIdioma del contenido:\\nServicio:\\nHora GMT:\\nPaquete:\\nVersión:\\nVersión del S.O:</string>
<string name="black_theme_title">Negro</string>

2
app/src/main/res/values-he/strings.xml
View File

@ -105,7 +105,7 @@
<string name="error_snackbar_action">דווח</string>
<string name="what_device_headline">מידע:</string>
<string name="what_happened_headline">מה קרה:</string>
<string name="info_labels">מה:\\nבקשה:\\nשפת התוכן:\\nשירות:\\nזמן GMT:\\nחבילה:\\nגרסה:\\nגרסת מערכת ההפעלה:\\nGlob. טווח IP:</string>
<string name="info_labels">מה:\\nבקשה:\\nשפת התוכן:\\nשירות:\\nזמן GMT:\\nחבילה:\\nגרסה:\\nגרסת מערכת ההפעלה:</string>
<string name="subscribe_button_title">הירשם כמנוי</string>
<string name="subscribed_button_title">רשום כמנוי</string>
<string name="channel_unsubscribed">ביטול מנוי לערוץ</string>

2
app/src/main/res/values-id/strings.xml
View File

@ -118,7 +118,7 @@
<string name="youtube_signature_decryption_error">Tidak bisa mendekrip tanda tangan URL video</string>
<string name="app_ui_crash">App/UI rusak</string>
<string name="could_not_get_stream">Tidak bisa mendapatkan stream apapun</string>
<string name="info_labels">Apa:\\nPermintaan:\\nBahasa Konten:\\nLayanan:\\nWaktu GMT:\\nPaket:\\nVersi:\\nVersi OS:\\nIP:</string>
<string name="info_labels">Apa:\\nPermintaan:\\nBahasa Konten:\\nLayanan:\\nWaktu GMT:\\nPaket:\\nVersi:\\nVersi OS:</string>
<string name="user_report">Laporan pengguna</string>
<string name="msg_threads">Thread</string>

2
app/src/main/res/values-nb-rNO/strings.xml
View File

@ -118,7 +118,7 @@
<string name="msg_running_detail">Trykk for detaljer</string>
<string name="msg_wait">Vent…</string>
<string name="msg_copied">Kopiert til utklippstavle</string>
<string name="info_labels">Hva:\\nForespørsel:\\nInnholdsspråk:\\nTjeneste:\\nGMT-tid:\\nPakke:\\nVersjon:\\nOperativsystemsversjon:\\nGlobal IP-blokk:</string>
<string name="info_labels">Hva:\\nForespørsel:\\nInnholdsspråk:\\nTjeneste:\\nGMT-tid:\\nPakke:\\nVersjon:\\nOperativsystemsversjon:</string>
<string name="start">Start</string>
<string name="add">Nytt mål</string>
<string name="msg_url_malform">Feilaktig nettadresse eller manglende internettilknytning</string>

2
app/src/main/res/values-pt-rBR/strings.xml
View File

@ -113,7 +113,7 @@
<string name="use_tor_title">Usar Tor</string>
<string name="user_report">Relatório do usuário</string>
<string name="show_play_with_kodi_title">Exibir opção \"Reproduzir com Kodi\"</string>
<string name="info_labels">O que:\\nRequisição:\\nIdioma do conteúdo:\\nServiço:\\nHora GMT:\\nPacote:\\nVersão:\\nVersão SO:\\nFaixa de IP:</string>
<string name="info_labels">O que:\\nRequisição:\\nIdioma do conteúdo:\\nServiço:\\nHora GMT:\\nPacote:\\nVersão:\\nVersão SO:</string>
<string name="open_in_popup_mode">Abrir em modo popup</string>
<string name="default_popup_resolution_title">Resolução padrão de popup</string>

2
app/src/main/res/values-ru/strings.xml
View File

@ -143,7 +143,7 @@
<string name="add">Новая цель</string>
<string name="info_labels">Что:\\nЗапрос:\\nЯзык контента:\\nСервис:\\nВремя по Гринвичу:\\nПакет:\\nВерсия:\\nВерсия ОС:\\nГлобальный диапазон IP:</string>
<string name="info_labels">Что:\\nЗапрос:\\nЯзык контента:\\nСервис:\\nВремя по Гринвичу:\\nПакет:\\nВерсия:\\nВерсия ОС:</string>
<string name="msg_popup_permission">Это разрешение нужно для
\nвоспроизведения в окне</string>

2
app/src/main/res/values-sl/strings.xml
View File

@ -131,7 +131,7 @@
<string name="reCaptcha_title">Izziv reCAPTCHA</string>
<string name="recaptcha_request_toast">Zahteva izziva reCAPTCHA</string>
<string name="info_labels">Predmet:\\nZahteva:\\nJezik vsebine:\\nStoritev:\\nČas v GMT:\\nPaket:\\nRazličica:\\nRazličica OS:\\nObseg IP:</string>
<string name="info_labels">Predmet:\\nZahteva:\\nJezik vsebine:\\nStoritev:\\nČas v GMT:\\nPaket:\\nRazličica:\\nRazličica OS:</string>
<string name="black_theme_title">Črna</string>
<string name="all">Vse</string>

2
app/src/main/res/values-sv/strings.xml
View File

@ -151,7 +151,7 @@
<string name="player_recoverable_failure">Återhämtar sig från spelarfel</string>
<string name="error_report_button_text">Rapportera fel via e-post</string>
<string name="info_labels">Vad:\\nBegäran:\\nInnehålls Språk:\\nTjänst:\\nGMT Tid:\\nPaket:\\nVersion:\\nOS-version:\\nGlob. IP-intervall:</string>
<string name="info_labels">Vad:\\nBegäran:\\nInnehålls Språk:\\nTjänst:\\nGMT Tid:\\nPaket:\\nVersion:\\nOS-version:</string>
<string name="list_thumbnail_view_description">Videons miniatyrbild</string>
<string name="detail_thumbnail_view_description">Videons miniatyrbild</string>
<string name="detail_uploader_thumbnail_view_description">Uppladdarens avatar miniatyrbild</string>