diff --git a/app/src/main/res/layout/page_settings.xml b/app/src/main/res/layout/page_settings.xml index 23b1be1a..0d8eada9 100644 --- a/app/src/main/res/layout/page_settings.xml +++ b/app/src/main/res/layout/page_settings.xml @@ -151,7 +151,7 @@ android:layout_width="0dp" android:layout_height="@dimen/settings_color_button_height" android:layout_margin="@dimen/settings_color_button_margin" - android:text="@string/settings_follow_req_color" + android:text="@string/settings_follow_color" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/page_settings_color_repost" app:layout_constraintEnd_toStartOf="@id/settings_color_placeholder" @@ -162,11 +162,9 @@ android:layout_width="0dp" android:layout_height="@dimen/settings_color_button_height" android:layout_margin="@dimen/settings_color_button_margin" - android:text="@string/settings_follow_color" app:layout_constraintStart_toEndOf="@id/page_settings_color_follow" app:layout_constraintTop_toBottomOf="@id/page_settings_color_favorite" - app:layout_constraintEnd_toEndOf="parent" - style="@style/ColorButton" /> + app:layout_constraintEnd_toEndOf="parent" /> diff --git a/app/src/main/res/values-de-rDE/arrays.xml b/app/src/main/res/values-de-rDE/arrays.xml index eca9c413..bbe5d2c5 100644 --- a/app/src/main/res/values-de-rDE/arrays.xml +++ b/app/src/main/res/values-de-rDE/arrays.xml @@ -48,9 +48,9 @@ - zeige alle - nur lokale - nur entfernte + zeige alle Posts + zeige lokale Posts + zeige externe Posts \ No newline at end of file diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index b5f45493..14d96ad0 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -193,7 +193,6 @@ Accounts Account hinzufügen Repost - Anfrage Icon Benutzerdefinierter App-Name Follow Icon Kompakte Profilansicht diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 6244f3a3..d6ba4e57 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -245,7 +245,6 @@ Cambiar imagen de perfil Compartir enlace Re-publicar - Solicitud de seguimiento Icono de quienes sigues Cuentas Traducir diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index a160fe3a..af484069 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -124,9 +124,9 @@ - show all - local only - remote only + show all posts + show local posts + show remote posts \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 201a92b6..62e75b96 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -299,7 +299,6 @@ change profile image share link Reposts - Follow request custom app name Following icon Accounts