diff --git a/README.md b/README.md index a606c5222..c52c36e87 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,9 @@ Whether you have ideas, translations, design changes, code cleaning, or real hea ### Donate -**BTC:** `bc1qfcgqwddr894mywn9rk2crzlgvlac3prkwhdrdq` +**BTC:** `bc1q0hk2smc74ej8fxupfrp05wk867e54e2zztnxfc` + +**XMR:** `44txdmy4E5bDzMYQJh1ZSoHbrp1sWfpGa2FYg26L2ya8EaRejPsh42yVrYhepW9P4YWvrqmTZvms35z5FDgqy1xcVewk18d` ## Mirrors (read-only) GitLab

diff --git a/app/src/main/java/com/github/libretube/ChannelFragment.kt b/app/src/main/java/com/github/libretube/ChannelFragment.kt index 684b96333..96d3d77e9 100644 --- a/app/src/main/java/com/github/libretube/ChannelFragment.kt +++ b/app/src/main/java/com/github/libretube/ChannelFragment.kt @@ -209,7 +209,7 @@ class ChannelFragment : Fragment() { runOnUiThread { view.findViewById(R.id.channel_scrollView).visibility = View.VISIBLE view.findViewById(R.id.channel_name).text=response.name - view.findViewById(R.id.channel_subs).text=response.subscriberCount.formatShort() + " subscribers" + view.findViewById(R.id.channel_subs).text=resources.getString(R.string.subscribers, response.subscriberCount.formatShort()) view.findViewById(R.id.channel_description).text=response.description val bannerImage = view.findViewById(R.id.channel_banner) val channelImage = view.findViewById(R.id.channel_image) diff --git a/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt b/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt index f52371135..eb3a10903 100644 --- a/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt +++ b/app/src/main/java/com/github/libretube/adapters/SearchAdapter.kt @@ -1,6 +1,5 @@ package com.github.libretube.adapters - import android.os.Bundle import android.view.LayoutInflater import android.view.View diff --git a/app/src/main/res/layout/fragment_channel.xml b/app/src/main/res/layout/fragment_channel.xml index e1bfb7648..3e5005186 100644 --- a/app/src/main/res/layout/fragment_channel.xml +++ b/app/src/main/res/layout/fragment_channel.xml @@ -91,7 +91,7 @@ android:layout_marginTop="10dp" android:layout_marginRight="10dp" android:layout_marginBottom="5dp" - android:text="Videos" + android:text="@string/videos" android:textSize="17sp" android:textStyle="bold" /> diff --git a/app/src/main/res/menu/bottom_menu.xml b/app/src/main/res/menu/bottom_menu.xml index 50ce0ee35..459eb0a82 100644 --- a/app/src/main/res/menu/bottom_menu.xml +++ b/app/src/main/res/menu/bottom_menu.xml @@ -1,9 +1,8 @@ - - - - + + + \ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 23701ba24..404d7c475 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,7 +1,12 @@ + Trends + Abos + Bibliothek Suche ABONNIEREN + ABONNIERT + Videos Teilen Benutzername Passwort @@ -41,7 +46,6 @@ Qualtität wählen: Anmelden/Registrieren Herunterladen abgeschlossen! - ABONNIERT Speichern Du bist bereits angemeldet. Du kannst dich hier von deinem Account abmelden. Bitte melde dich zuerst an oder registriere dich in den Einstellungen! @@ -50,5 +54,9 @@ Benutzername und Passwort können nicht leer sein! Wiedergabeliste löschen Bist du sicher, dass du die Wiedergabeliste löschen möchtest\? - Über + Über + Automatisch + Hell + Dunkel + %1$s Abonnenten \ No newline at end of file diff --git a/app/src/main/res/values/array.xml b/app/src/main/res/values/array.xml index 8a71c19a2..79b3f2db7 100644 --- a/app/src/main/res/values/array.xml +++ b/app/src/main/res/values/array.xml @@ -452,9 +452,9 @@ - System Default - Light Theme - Dark Theme + @string/systemDefault + @string/lightTheme + @string/darkTheme diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0a21ab8a0..bcd622b51 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,8 +1,12 @@ + Home + Subscriptions + Library Yes Choose Quality: Search + Videos Subscribe Unsubscribe Share @@ -55,4 +59,8 @@ About Change Language System Language + System Default + Light Theme + Dark Theme + %1$s subscribers