From 694013c9df5c4ace38ca4a825b38e9db9c3b487b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Wed, 8 Jan 2020 21:55:17 +0100 Subject: [PATCH 01/12] Spelling: Language reworked 2 --- app/src/main/res/values/strings.xml | 74 ++++++++++++++--------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 54ae40d1d..0b20edd7d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,10 +1,10 @@ NewPipe - Tap search to get started + Tap \"Search\" to get started %1$s views Published on %1$s - No stream player found. Do you want to install VLC? + No stream player found. Install VLC? No stream player found (you can install VLC to play it). Install Cancel @@ -16,14 +16,14 @@ Download stream file Search Settings - Did you mean: %1$s\? + Did you mean: %1$s? Share with Choose browser rotation Use external video player - Removes audio at SOME resolutions + Removes audio at some resolutions Use external audio player - NewPipe popup mode + Popup mode RSS Subscribe Subscribed @@ -43,24 +43,24 @@ Add To Video download folder Downloaded video files are stored here - Choose the download folder for video files + Choose download folder for video files Audio download folder Downloaded audio files are stored here - Choose the download folder for audio files + Choose 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 Default popup resolution Show higher resolutions - Only some devices support playing 2K/4K videos + Only some devices can play 2K/4K videos Play with Kodi - Kore app not found. Install it? + Install missing Kore app? org.xbmc.kore Show \"Play with Kodi\" option - Enable lock screen video thumbnail - Display an option to play a video via Kodi media center - When using the background player a video thumbnail will be displayed on the lock screen + Lock screen video thumbnail + Displayed option to play a video via Kodi media center + Using the background player displays a video thumbnail on the lock screen Audio Default audio format Default video format @@ -75,20 +75,20 @@ Fast-forward/-rewind seek duration Load thumbnails Show comments - Disable to stop showing comments + Turn off to hide comments Turn off to prevent loading thumbnails, saving data and memory usage. Changes clear both in-memory and on-disk image cache. Image cache wiped Wipe cached metadata Remove all cached webpage data Metadata cache wiped Auto-queue next stream - Auto-append a related stream when playing the last stream in a non-repeating queue + Auto-append a related stream (to non-repeating queue) after last file Volume gesture control - Use gestures to control the volume of the player + Use gestures to control player volume Brightness gesture control - Use gestures to control the brightness of the player + Use gestures to control player brightness Player gesture controls - Use gestures to control the brightness and volume of the player + Use gestures to control player brightness and volume Search suggestions Show suggestions when searching Search history @@ -100,21 +100,21 @@ Show playback position indicators in lists Clear data Keep track of watched videos - Resume on focus gain - Continue playing after interruptions (e.g. phone calls) + Resumed playing + Continue playing after interruptions (e.g. phonecalls) Download Next Autoplay Show \'Next\' and \'Similar\' videos Show \"Hold to append\" tip - Show tip when background or popup button is pressed on video details page + Show tip when pressing the background or the popup button in video \"Details:\" Unsupported URL Default content country Service Default content language PeerTube instances Select your favorite PeerTube instances - Find the instances that best suit you on %s + Find the instances you like on %s https://joinpeertube.org/instances#instances-list Add instance Enter instance URL @@ -138,9 +138,9 @@ Play Content Age restricted content - Show age restricted video. Allowing such material is possible from Settings. - LIVE - LIVE + Show age restricted video. Future changes are possible from \"Settings\". + Live + Live Downloads Downloads Error report @@ -198,7 +198,7 @@ Error External storage unavailable - Downloading to external SD card not possible. Reset download folder location\? + Downloading to external SD card not possible. Reset download folder location? Network error Could not load all thumbnails Could not decrypt video URL signature @@ -224,15 +224,15 @@ Filename cannot be empty An error occurred: %1$s No streams available to download - Using default tabs, error while reading saved tabs + Could not read saved tabs, so using default ones Restore defaults - Do you want to restore the defaults? + Do you want to restore defaults? Sorry, that should not have happened. Guru Meditation. - Report error via e-mail + Report this per e-mail Sorry, some errors occurred. - REPORT + Report Info: What happened: What:\\nRequest:\\nContent Lang:\\nService:\\nGMT Time:\\nPackage:\\nVersion:\\nOS version: @@ -246,7 +246,7 @@ Dislikes Use Tor (Experimental) Force download traffic through Tor for increased privacy (streaming videos not yet supported). - Report an Error + Report Error User report No results @string/no_videos @@ -258,7 +258,7 @@ Video Audio Retry - Storage access permission denied + Grant access to storage first k M B @@ -269,7 +269,7 @@ %s subscriber %s subscribers - Subscribers count not available + Subscriber count unavailable No views %s view @@ -355,7 +355,7 @@ https://github.com/TeamNewPipe/NewPipe View on GitHub Donate - NewPipe is developed by volunteers spending time bringing you the best experience. Give back to help developers make NewPipe even better while enjoying a cup of coffee. + NewPipe is developed by volunteers spending time bringing you the best experience. Give back to help make NewPipe even better. https://newpipe.schabi.org/donate Give back Website @@ -466,7 +466,7 @@ Captions Modify player caption text scale and background styles. Requires app restart to take effect. - Enable LeakCanary + LeakCanary Memory leak monitoring may cause the app to become unresponsive when heap dumping Report out-of-lifecycle errors Force reporting of undeliverable Rx exceptions outside of fragment or activity lifecycle after disposal @@ -529,7 +529,7 @@ Auto Switch View - NewPipe Update Available! + There is a fresh NewPipe version available! Tap to download Finished Pending @@ -557,7 +557,7 @@ The file can not be created The destination folder can not be created Permission denied by the system - Secure connection failed + Could not connect securely Could not find the server Can not connect to the server The server does not send data @@ -585,7 +585,7 @@ You will be asked where to save each download 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 + The Storage Access Framework allows downloads to an external SD card.\nNote: Some devices are incompatible Choose an instance From 6bc697f92601b966702fc15a30add41b7772ce51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Thu, 9 Jan 2020 04:36:39 +0100 Subject: [PATCH 02/12] Continue ending playback queue --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0b20edd7d..f1896c7ba 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -82,7 +82,7 @@ Remove all cached webpage data Metadata cache wiped Auto-queue next stream - Auto-append a related stream (to non-repeating queue) after last file + Continue ending (non-repeating) playback queue by appending a related stream Volume gesture control Use gestures to control player volume Brightness gesture control From bca547ce44021c32a6b99a1ab059174a2f215177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Thu, 9 Jan 2020 04:38:47 +0100 Subject: [PATCH 03/12] \'Storage Access Framework\' --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index f1896c7ba..940008aae 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -585,7 +585,7 @@ You will be asked where to save each download 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 incompatible + The \'Storage Access Framework\' allows downloads to an external SD card.\nNote: Some devices are incompatible Choose an instance From 294c35b2fb2f15e4393eb38cb6985ecbb52b6272 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Fri, 7 Feb 2020 17:51:14 +0100 Subject: [PATCH 04/12] Spelling: the settings Co-Authored-By: Tobias Groza --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 940008aae..cf44da7c0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -138,7 +138,7 @@ Play Content Age restricted content - Show age restricted video. Future changes are possible from \"Settings\". + Show age restricted video. Future changes are possible from the settings. Live Live Downloads From 4c13dda1f953fcf38ddf579e52fd4acdc62aac84 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Fri, 7 Feb 2020 17:55:37 +0100 Subject: [PATCH 05/12] Spelling: Could not establish secure connection --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cf44da7c0..9d450634c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -557,7 +557,7 @@ The file can not be created The destination folder can not be created Permission denied by the system - Could not connect securely + Could not establish secure connection Could not find the server Can not connect to the server The server does not send data From 3abc660eb30a103cbd6ec355d96f52348b3d0fe7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Fri, 7 Feb 2020 17:57:38 +0100 Subject: [PATCH 06/12] Spelling: Install the fresh NewPipe version. --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9d450634c..bdc3b30e0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -529,7 +529,7 @@ Auto Switch View - There is a fresh NewPipe version available! + Install the fresh NewPipe version. Tap to download Finished Pending From f319e3e75a886c3523708f8b7a562be8cabd17b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Fri, 7 Feb 2020 18:01:45 +0100 Subject: [PATCH 07/12] Spelling: Treat the NewPipe makers to something you like --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index bdc3b30e0..4ae59aa33 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -355,7 +355,7 @@ https://github.com/TeamNewPipe/NewPipe View on GitHub Donate - NewPipe is developed by volunteers spending time bringing you the best experience. Give back to help make NewPipe even better. + Treat the newPipe makers to something you like, by way of funding its development. https://newpipe.schabi.org/donate Give back Website From 85acc53d408630ae63bd045dfe69604841046d24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Fri, 7 Feb 2020 18:06:09 +0100 Subject: [PATCH 08/12] Spelling: Video thumbnail shown --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4ae59aa33..c3ffc9c14 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -60,7 +60,7 @@ Show \"Play with Kodi\" option Lock screen video thumbnail Displayed option to play a video via Kodi media center - Using the background player displays a video thumbnail on the lock screen + A video thumbnail is shown on the lock screen when using the background player Audio Default audio format Default video format From 3ff85c2ab71d89ff54cf67507b0a81ad12999ce6 Mon Sep 17 00:00:00 2001 From: TobiGr Date: Fri, 7 Feb 2020 22:22:27 +0100 Subject: [PATCH 09/12] Make report error title in snackbar uppercase again --- app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 e7a6319e3..0bb93c63f 100644 --- a/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java +++ b/app/src/main/java/org/schabi/newpipe/report/ErrorActivity.java @@ -91,7 +91,7 @@ public class ErrorActivity extends AppCompatActivity { if (rootView != null) { Snackbar.make(rootView, R.string.error_snackbar_message, 3 * 1000) .setActionTextColor(Color.YELLOW) - .setAction(R.string.error_snackbar_action, v -> + .setAction(context.getString(R.string.error_snackbar_action).toUpperCase(), v -> startErrorActivity(returnActivity, context, errorInfo, el)).show(); } else { startErrorActivity(returnActivity, context, errorInfo, el); From a75deb6ba2b7a6758caa44cb3d3dff62a730ad11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Allan=20Nordh=C3=B8y?= Date: Sun, 9 Feb 2020 16:29:51 +0100 Subject: [PATCH 10/12] Reverted changes --- app/src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c3ffc9c14..ccd58f003 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -355,7 +355,7 @@ https://github.com/TeamNewPipe/NewPipe View on GitHub Donate - Treat the newPipe makers to something you like, by way of funding its development. + NewPipe is developed by volunteers spending their free time bringing you the best user experience. Give back to help developers make NewPipe even better while they enjoy a cup of coffee. https://newpipe.schabi.org/donate Give back Website @@ -529,7 +529,7 @@ Auto Switch View - Install the fresh NewPipe version. + NewPipe Update Available! Tap to download Finished Pending From 67af05e5048dc6124a741ad1dd1544845f815976 Mon Sep 17 00:00:00 2001 From: Tobias Groza Date: Fri, 14 Feb 2020 19:12:59 +0100 Subject: [PATCH 11/12] Use "Report error" instead of "Report Error" Co-Authored-By: Stypox --- app/src/main/res/values/strings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ccd58f003..eb17fcd50 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -246,7 +246,7 @@ Dislikes Use Tor (Experimental) Force download traffic through Tor for increased privacy (streaming videos not yet supported). - Report Error + Report error User report No results @string/no_videos From fbcee61e04e8d425abed47f5c450c8f70d64a628 Mon Sep 17 00:00:00 2001 From: Tobias Groza Date: Sun, 16 Feb 2020 22:41:56 +0100 Subject: [PATCH 12/12] Apply suggestions from code review Co-Authored-By: Stypox --- app/src/main/res/values/strings.xml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index a2c303c17..1a70d9eaa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -59,7 +59,7 @@ org.xbmc.kore Show \"Play with Kodi\" option Lock screen video thumbnail - Displayed option to play a video via Kodi media center + Display an option to play a video via Kodi media center A video thumbnail is shown on the lock screen when using the background player Audio Default audio format @@ -100,7 +100,7 @@ Show playback position indicators in lists Clear data Keep track of watched videos - Resumed playing + Resume playing Continue playing after interruptions (e.g. phonecalls) Download Next @@ -231,7 +231,7 @@ Sorry, that should not have happened. Guru Meditation. - Report this per e-mail + Report this error via e-mail Sorry, some errors occurred. Report Info: @@ -560,7 +560,7 @@ The file can not be created The destination folder can not be created Permission denied by the system - Could not establish secure connection + Could not establish a secure connection Could not find the server Can not connect to the server The server does not send data @@ -590,7 +590,7 @@ You will be asked where to save each download 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 incompatible + The \'Storage Access Framework\' allows downloads to an external SD card.\nNote: some devices are incompatible Choose an instance App language System default