diff options
Diffstat (limited to 'app/src/main/res')
130 files changed, 1959 insertions, 926 deletions
diff --git a/app/src/main/res/drawable-hdpi/actionbar_button_normal.9.png b/app/src/main/res/drawable-hdpi/actionbar_button_normal.9.png Binary files differdeleted file mode 100644 index 385f751c..00000000 --- a/app/src/main/res/drawable-hdpi/actionbar_button_normal.9.png +++ /dev/null diff --git a/app/src/main/res/drawable-hdpi/ic_action_playback_speed_dark.png b/app/src/main/res/drawable-hdpi/ic_action_playback_speed_dark.png Binary files differnew file mode 100644 index 00000000..5f4d890a --- /dev/null +++ b/app/src/main/res/drawable-hdpi/ic_action_playback_speed_dark.png diff --git a/app/src/main/res/drawable-hdpi/ic_action_playback_speed_light.png b/app/src/main/res/drawable-hdpi/ic_action_playback_speed_light.png Binary files differnew file mode 100644 index 00000000..4b481822 --- /dev/null +++ b/app/src/main/res/drawable-hdpi/ic_action_playback_speed_light.png diff --git a/app/src/main/res/drawable-hdpi/ic_toggle_played.png b/app/src/main/res/drawable-hdpi/ic_toggle_played.png Binary files differnew file mode 100644 index 00000000..944ff8be --- /dev/null +++ b/app/src/main/res/drawable-hdpi/ic_toggle_played.png diff --git a/app/src/main/res/drawable-hdpi/media_fastforward_dark.png b/app/src/main/res/drawable-hdpi/media_fastforward_dark.png Binary files differnew file mode 100644 index 00000000..eab0cdfd --- /dev/null +++ b/app/src/main/res/drawable-hdpi/media_fastforward_dark.png diff --git a/app/src/main/res/drawable-hdpi/media_fastforward_light.png b/app/src/main/res/drawable-hdpi/media_fastforward_light.png Binary files differnew file mode 100644 index 00000000..905faa9c --- /dev/null +++ b/app/src/main/res/drawable-hdpi/media_fastforward_light.png diff --git a/app/src/main/res/drawable-hdpi/media_rewind_dark.png b/app/src/main/res/drawable-hdpi/media_rewind_dark.png Binary files differnew file mode 100644 index 00000000..5d2d62a7 --- /dev/null +++ b/app/src/main/res/drawable-hdpi/media_rewind_dark.png diff --git a/app/src/main/res/drawable-hdpi/media_rewind_light.png b/app/src/main/res/drawable-hdpi/media_rewind_light.png Binary files differnew file mode 100644 index 00000000..15bc91a8 --- /dev/null +++ b/app/src/main/res/drawable-hdpi/media_rewind_light.png diff --git a/app/src/main/res/drawable-hdpi/stat_notify_download.png b/app/src/main/res/drawable-hdpi/stat_notify_download.png Binary files differdeleted file mode 100644 index 48ca6924..00000000 --- a/app/src/main/res/drawable-hdpi/stat_notify_download.png +++ /dev/null diff --git a/app/src/main/res/drawable-hdpi/toast_frame.9.png b/app/src/main/res/drawable-hdpi/toast_frame.9.png Binary files differdeleted file mode 100644 index 8f5d8119..00000000 --- a/app/src/main/res/drawable-hdpi/toast_frame.9.png +++ /dev/null diff --git a/app/src/main/res/drawable-mdpi/ic_action_playback_speed_dark.png b/app/src/main/res/drawable-mdpi/ic_action_playback_speed_dark.png Binary files differnew file mode 100644 index 00000000..b05ecefd --- /dev/null +++ b/app/src/main/res/drawable-mdpi/ic_action_playback_speed_dark.png diff --git a/app/src/main/res/drawable-mdpi/ic_action_playback_speed_light.png b/app/src/main/res/drawable-mdpi/ic_action_playback_speed_light.png Binary files differnew file mode 100644 index 00000000..392d2b4d --- /dev/null +++ b/app/src/main/res/drawable-mdpi/ic_action_playback_speed_light.png diff --git a/app/src/main/res/drawable-mdpi/ic_toggle_played.png b/app/src/main/res/drawable-mdpi/ic_toggle_played.png Binary files differnew file mode 100644 index 00000000..02524f4c --- /dev/null +++ b/app/src/main/res/drawable-mdpi/ic_toggle_played.png diff --git a/app/src/main/res/drawable-mdpi/media_fastforward_dark.png b/app/src/main/res/drawable-mdpi/media_fastforward_dark.png Binary files differnew file mode 100644 index 00000000..f999e0b8 --- /dev/null +++ b/app/src/main/res/drawable-mdpi/media_fastforward_dark.png diff --git a/app/src/main/res/drawable-mdpi/media_fastforward_light.png b/app/src/main/res/drawable-mdpi/media_fastforward_light.png Binary files differnew file mode 100644 index 00000000..23107742 --- /dev/null +++ b/app/src/main/res/drawable-mdpi/media_fastforward_light.png diff --git a/app/src/main/res/drawable-mdpi/media_rewind_dark.png b/app/src/main/res/drawable-mdpi/media_rewind_dark.png Binary files differnew file mode 100644 index 00000000..2ecda48a --- /dev/null +++ b/app/src/main/res/drawable-mdpi/media_rewind_dark.png diff --git a/app/src/main/res/drawable-mdpi/media_rewind_light.png b/app/src/main/res/drawable-mdpi/media_rewind_light.png Binary files differnew file mode 100644 index 00000000..f7c9b303 --- /dev/null +++ b/app/src/main/res/drawable-mdpi/media_rewind_light.png diff --git a/app/src/main/res/drawable-mdpi/stat_notify_download.png b/app/src/main/res/drawable-mdpi/stat_notify_download.png Binary files differdeleted file mode 100644 index 4164e0fa..00000000 --- a/app/src/main/res/drawable-mdpi/stat_notify_download.png +++ /dev/null diff --git a/app/src/main/res/drawable-v21/notification_fastforward.xml b/app/src/main/res/drawable-v21/notification_fastforward.xml new file mode 100644 index 00000000..d0ab76a2 --- /dev/null +++ b/app/src/main/res/drawable-v21/notification_fastforward.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<bitmap + xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/media_fastforward_light"/>
\ No newline at end of file diff --git a/app/src/main/res/drawable-v21/notification_rewind.xml b/app/src/main/res/drawable-v21/notification_rewind.xml new file mode 100644 index 00000000..25a16a02 --- /dev/null +++ b/app/src/main/res/drawable-v21/notification_rewind.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<bitmap + xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/media_rewind_light"/>
\ No newline at end of file diff --git a/app/src/main/res/drawable-xhdpi/ic_action_playback_speed_dark.png b/app/src/main/res/drawable-xhdpi/ic_action_playback_speed_dark.png Binary files differnew file mode 100644 index 00000000..2aeadf7e --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/ic_action_playback_speed_dark.png diff --git a/app/src/main/res/drawable-xhdpi/ic_action_playback_speed_light.png b/app/src/main/res/drawable-xhdpi/ic_action_playback_speed_light.png Binary files differnew file mode 100644 index 00000000..ce3f561c --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/ic_action_playback_speed_light.png diff --git a/app/src/main/res/drawable-xhdpi/ic_toggle_played.png b/app/src/main/res/drawable-xhdpi/ic_toggle_played.png Binary files differnew file mode 100644 index 00000000..c681150c --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/ic_toggle_played.png diff --git a/app/src/main/res/drawable-xhdpi/media_fastforward_dark.png b/app/src/main/res/drawable-xhdpi/media_fastforward_dark.png Binary files differnew file mode 100644 index 00000000..3c653286 --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/media_fastforward_dark.png diff --git a/app/src/main/res/drawable-xhdpi/media_fastforward_light.png b/app/src/main/res/drawable-xhdpi/media_fastforward_light.png Binary files differnew file mode 100644 index 00000000..f105b458 --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/media_fastforward_light.png diff --git a/app/src/main/res/drawable-xhdpi/media_rewind_dark.png b/app/src/main/res/drawable-xhdpi/media_rewind_dark.png Binary files differnew file mode 100644 index 00000000..08fdff06 --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/media_rewind_dark.png diff --git a/app/src/main/res/drawable-xhdpi/media_rewind_light.png b/app/src/main/res/drawable-xhdpi/media_rewind_light.png Binary files differnew file mode 100644 index 00000000..3998f715 --- /dev/null +++ b/app/src/main/res/drawable-xhdpi/media_rewind_light.png diff --git a/app/src/main/res/drawable-xhdpi/stat_notify_download.png b/app/src/main/res/drawable-xhdpi/stat_notify_download.png Binary files differdeleted file mode 100644 index 96ceb383..00000000 --- a/app/src/main/res/drawable-xhdpi/stat_notify_download.png +++ /dev/null diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_playback_speed_dark.png b/app/src/main/res/drawable-xxhdpi/ic_action_playback_speed_dark.png Binary files differnew file mode 100644 index 00000000..a9acc5e6 --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/ic_action_playback_speed_dark.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_playback_speed_light.png b/app/src/main/res/drawable-xxhdpi/ic_action_playback_speed_light.png Binary files differnew file mode 100644 index 00000000..dcd6fea8 --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/ic_action_playback_speed_light.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_toggle_played.png b/app/src/main/res/drawable-xxhdpi/ic_toggle_played.png Binary files differnew file mode 100644 index 00000000..33f9d819 --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/ic_toggle_played.png diff --git a/app/src/main/res/drawable-xxhdpi/media_fastforward_dark.png b/app/src/main/res/drawable-xxhdpi/media_fastforward_dark.png Binary files differnew file mode 100644 index 00000000..90f045ea --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/media_fastforward_dark.png diff --git a/app/src/main/res/drawable-xxhdpi/media_fastforward_light.png b/app/src/main/res/drawable-xxhdpi/media_fastforward_light.png Binary files differnew file mode 100644 index 00000000..73f0fba4 --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/media_fastforward_light.png diff --git a/app/src/main/res/drawable-xxhdpi/media_rewind_dark.png b/app/src/main/res/drawable-xxhdpi/media_rewind_dark.png Binary files differnew file mode 100644 index 00000000..ff5bda9a --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/media_rewind_dark.png diff --git a/app/src/main/res/drawable-xxhdpi/media_rewind_light.png b/app/src/main/res/drawable-xxhdpi/media_rewind_light.png Binary files differnew file mode 100644 index 00000000..c50c0825 --- /dev/null +++ b/app/src/main/res/drawable-xxhdpi/media_rewind_light.png diff --git a/app/src/main/res/drawable-xxhdpi/stat_notify_download.png b/app/src/main/res/drawable-xxhdpi/stat_notify_download.png Binary files differdeleted file mode 100644 index b2dc5651..00000000 --- a/app/src/main/res/drawable-xxhdpi/stat_notify_download.png +++ /dev/null diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_playback_speed_dark.png b/app/src/main/res/drawable-xxxhdpi/ic_action_playback_speed_dark.png Binary files differnew file mode 100644 index 00000000..c1e92342 --- /dev/null +++ b/app/src/main/res/drawable-xxxhdpi/ic_action_playback_speed_dark.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_playback_speed_light.png b/app/src/main/res/drawable-xxxhdpi/ic_action_playback_speed_light.png Binary files differnew file mode 100644 index 00000000..3dc5f32a --- /dev/null +++ b/app/src/main/res/drawable-xxxhdpi/ic_action_playback_speed_light.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_toggle_played.png b/app/src/main/res/drawable-xxxhdpi/ic_toggle_played.png Binary files differnew file mode 100644 index 00000000..0907fd2c --- /dev/null +++ b/app/src/main/res/drawable-xxxhdpi/ic_toggle_played.png diff --git a/app/src/main/res/drawable-xxxhdpi/media_fastforward_dark.png b/app/src/main/res/drawable-xxxhdpi/media_fastforward_dark.png Binary files differnew file mode 100644 index 00000000..63ac58e0 --- /dev/null +++ b/app/src/main/res/drawable-xxxhdpi/media_fastforward_dark.png diff --git a/app/src/main/res/drawable-xxxhdpi/media_fastforward_light.png b/app/src/main/res/drawable-xxxhdpi/media_fastforward_light.png Binary files differnew file mode 100644 index 00000000..d2f7506b --- /dev/null +++ b/app/src/main/res/drawable-xxxhdpi/media_fastforward_light.png diff --git a/app/src/main/res/drawable-xxxhdpi/media_rewind_dark.png b/app/src/main/res/drawable-xxxhdpi/media_rewind_dark.png Binary files differnew file mode 100644 index 00000000..e911b342 --- /dev/null +++ b/app/src/main/res/drawable-xxxhdpi/media_rewind_dark.png diff --git a/app/src/main/res/drawable-xxxhdpi/media_rewind_light.png b/app/src/main/res/drawable-xxxhdpi/media_rewind_light.png Binary files differnew file mode 100644 index 00000000..461118f1 --- /dev/null +++ b/app/src/main/res/drawable-xxxhdpi/media_rewind_light.png diff --git a/app/src/main/res/drawable/card_rounded_corners_black.xml b/app/src/main/res/drawable/card_rounded_corners_black.xml new file mode 100644 index 00000000..7592de64 --- /dev/null +++ b/app/src/main/res/drawable/card_rounded_corners_black.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <solid android:color="@color/background_material_dark"/> + <corners android:radius="@dimen/Card.Radius"/> + <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" /> +</shape>
\ No newline at end of file diff --git a/app/src/main/res/drawable/card_rounded_corners_dark.xml b/app/src/main/res/drawable/card_rounded_corners_dark.xml new file mode 100644 index 00000000..4db7d4b0 --- /dev/null +++ b/app/src/main/res/drawable/card_rounded_corners_dark.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <solid android:color="@android:color/black"/> + <corners android:radius="@dimen/Card.Radius"/> + <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" /> +</shape>
\ No newline at end of file diff --git a/app/src/main/res/drawable/card_rounded_corners_light.xml b/app/src/main/res/drawable/card_rounded_corners_light.xml new file mode 100644 index 00000000..5475c3d6 --- /dev/null +++ b/app/src/main/res/drawable/card_rounded_corners_light.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <solid android:color="@android:color/white"/> + <corners android:radius="@dimen/Card.Radius"/> + <padding android:left="0dip" android:top="0dip" android:right="0dip" android:bottom="0dip" /> +</shape>
\ No newline at end of file diff --git a/app/src/main/res/drawable/drawer_header.jpg b/app/src/main/res/drawable/drawer_header.jpg Binary files differdeleted file mode 100644 index f54a30e2..00000000 --- a/app/src/main/res/drawable/drawer_header.jpg +++ /dev/null diff --git a/app/src/main/res/drawable/drawer_header_dark.png b/app/src/main/res/drawable/drawer_header_dark.png Binary files differnew file mode 100644 index 00000000..a1c8d61f --- /dev/null +++ b/app/src/main/res/drawable/drawer_header_dark.png diff --git a/app/src/main/res/drawable/drawer_header_holo.png b/app/src/main/res/drawable/drawer_header_holo.png Binary files differnew file mode 100644 index 00000000..d84d096d --- /dev/null +++ b/app/src/main/res/drawable/drawer_header_holo.png diff --git a/app/src/main/res/drawable/drawer_header_light.png b/app/src/main/res/drawable/drawer_header_light.png Binary files differnew file mode 100644 index 00000000..1bcf4ec3 --- /dev/null +++ b/app/src/main/res/drawable/drawer_header_light.png diff --git a/app/src/main/res/drawable/notification_fastforward.xml b/app/src/main/res/drawable/notification_fastforward.xml new file mode 100644 index 00000000..355c6a5b --- /dev/null +++ b/app/src/main/res/drawable/notification_fastforward.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<bitmap + xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/media_fastforward_dark"/>
\ No newline at end of file diff --git a/app/src/main/res/drawable/notification_rewind.xml b/app/src/main/res/drawable/notification_rewind.xml new file mode 100644 index 00000000..ab7827a9 --- /dev/null +++ b/app/src/main/res/drawable/notification_rewind.xml @@ -0,0 +1,4 @@ +<?xml version="1.0" encoding="utf-8"?> +<bitmap + xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/media_rewind_dark"/>
\ No newline at end of file diff --git a/app/src/main/res/layout-land/download.xml b/app/src/main/res/layout-land/download.xml index f3e39a5f..855bf2a9 100644 --- a/app/src/main/res/layout-land/download.xml +++ b/app/src/main/res/layout-land/download.xml @@ -1,129 +1,122 @@ <?xml version="1.0" encoding="utf-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/download_layout_container" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/download_layout" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - - <LinearLayout android:orientation="horizontal" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/download_layout" + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <ViewFlipper + android:id="@+id/download_playlist_flipper" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1"> + + <github.daneren2005.dsub.view.RecyclingImageView + android:id="@+id/download_album_art_image" + android:src="@drawable/unknown_album_large" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:layout_weight="1" + android:scaleType="fitCenter"/> + + <include layout="@layout/download_playlist"/> + + </ViewFlipper> + + <RelativeLayout + android:id="@+id/download_control_layout" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1" + android:background="@android:color/transparent"> + + <LinearLayout + android:id="@+id/download_other_controls_wrapper" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:layout_above="@+id/download_song_title"> + + <LinearLayout + android:id="@+id/download_other_controls_layout" + android:orientation="horizontal" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal"> + + <ImageButton + android:id="@+id/download_rating_bad" + style="@style/DownloadActionImageButton" + android:src="?attr/rating_bad"/> + + <ImageButton + android:id="@+id/download_star" + style="@style/DownloadActionImageButton" + android:src="@android:drawable/star_big_off"/> + + <ImageButton + android:id="@+id/download_playback_speed" + style="@style/DownloadActionImageButton" + android:src="?attr/playback_speed"/> + + <ImageButton + android:id="@+id/download_bookmark" + style="@style/DownloadActionImageButton" + android:src="?attr/bookmark"/> + + <ImageButton + android:id="@+id/download_rating_good" + style="@style/DownloadActionImageButton" + android:src="?attr/rating_good"/> + </LinearLayout> + </LinearLayout> + + <TextView + android:id="@+id/download_song_title" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:layout_marginLeft="12dip" + android:layout_marginRight="12dip" + android:singleLine="true" + android:ellipsize="end" + android:gravity="center_horizontal" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="?android:textColorPrimary" + android:layout_above="@+id/download_status"/> + + <TextView + android:id="@+id/download_status" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:gravity="center_horizontal" + android:layout_marginBottom="8dip" + android:layout_marginLeft="12dip" + android:layout_marginRight="12dip" + android:singleLine="true" + android:ellipsize="end" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="?android:textColorSecondary" + android:layout_above="@+id/download_media_buttons_wrapper"/> + + <LinearLayout + android:id="@+id/download_media_buttons_wrapper" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_above="@+id/download_slider_wrapper"> + + <include layout="@layout/download_media_buttons"/> + </LinearLayout> + + <LinearLayout + android:id="@+id/download_slider_wrapper" android:layout_width="fill_parent" - android:layout_height="0dip" - android:layout_weight="1"> - - <github.daneren2005.dsub.view.MyViewFlipper - android:id="@+id/download_playlist_flipper" - android:layout_width="0dp" - android:layout_height="fill_parent" - android:layout_weight="1"> - - <github.daneren2005.dsub.view.RecyclingImageView - android:id="@+id/download_album_art_image" - android:src="@drawable/unknown_album_large" - android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:layout_weight="1" - android:scaleType="fitStart"/> - - <include layout="@layout/download_playlist"/> - - </github.daneren2005.dsub.view.MyViewFlipper> - - <RelativeLayout android:orientation="vertical" - android:id="@+id/download_control_layout" - android:layout_width="0dp" - android:layout_height="fill_parent" - android:layout_weight="1" - android:background="@android:color/transparent"> - - <LinearLayout - android:id="@+id/download_other_controls_wrapper" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_above="@+id/download_song_title"> - - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/download_other_controls_layout" - android:orientation="horizontal" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal"> - - <ImageButton - android:id="@+id/download_rating_bad" - style="@style/DownloadActionImageButton" - android:src="?attr/rating_bad"/> - - <ImageButton - android:id="@+id/download_star" - style="@style/DownloadActionImageButton" - android:src="@android:drawable/star_big_off"/> - - <ImageButton - android:id="@+id/download_bookmark" - style="@style/DownloadActionImageButton" - android:src="?attr/bookmark"/> - - <ImageButton - android:id="@+id/download_rating_good" - style="@style/DownloadActionImageButton" - android:src="?attr/rating_good"/> - </LinearLayout> - </LinearLayout> - - <TextView - android:id="@+id/download_song_title" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_marginLeft="12dip" - android:layout_marginRight="12dip" - android:singleLine="true" - android:ellipsize="end" - android:gravity="center_horizontal" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="?android:textColorPrimary" - android:layout_above="@+id/download_status"/> - - <TextView - android:id="@+id/download_status" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:gravity="center_horizontal" - android:layout_marginBottom="8dip" - android:layout_marginLeft="12dip" - android:layout_marginRight="12dip" - android:singleLine="true" - android:ellipsize="end" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="?android:textColorSecondary" - android:layout_above="@+id/download_media_buttons_wrapper"/> - - <LinearLayout - android:id="@+id/download_media_buttons_wrapper" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_above="@+id/download_slider_wrapper"> - - <include layout="@layout/download_media_buttons"/> - </LinearLayout> - - <LinearLayout - android:id="@+id/download_slider_wrapper" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true"> - - <include layout="@layout/download_slider"/> - </LinearLayout> - - </RelativeLayout> + android:layout_height="wrap_content" + android:layout_alignParentBottom="true"> + <include layout="@layout/download_slider"/> </LinearLayout> - </LinearLayout> -</FrameLayout> + + </RelativeLayout> + +</LinearLayout> diff --git a/app/src/main/res/layout-large-land/download.xml b/app/src/main/res/layout-large-land/download.xml index 8b252190..cf5ef571 100644 --- a/app/src/main/res/layout-large-land/download.xml +++ b/app/src/main/res/layout-large-land/download.xml @@ -1,130 +1,121 @@ <?xml version="1.0" encoding="utf-8"?> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/download_layout_container" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/download_layout" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - - <LinearLayout android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="0dip" - android:layout_weight="1"> - - <github.daneren2005.dsub.view.RecyclingImageView - android:id="@+id/download_album_art_image" - android:src="@drawable/unknown_album_large" - android:layout_width="0dp" - android:layout_height="fill_parent" - android:layout_weight="1" - android:scaleType="fitStart"/> - - <RelativeLayout android:orientation="vertical" - android:id="@+id/download_control_layout" - android:layout_width="0dp" - android:layout_height="fill_parent" - android:layout_weight="1" - android:background="@android:color/transparent"> - - <github.daneren2005.dsub.view.MyViewFlipper - android:id="@+id/download_playlist_flipper" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_above="@+id/download_song_title"> - - <RelativeLayout - android:id="@+id/download_other_controls_wrapper" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:orientation="vertical"> - - <LinearLayout - android:id="@+id/download_other_controls_layout" - android:orientation="horizontal" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_alignParentBottom="true"> - - <ImageButton - android:id="@+id/download_rating_bad" - style="@style/DownloadActionImageButton" - android:src="?attr/rating_bad"/> - - <ImageButton - android:id="@+id/download_star" - style="@style/DownloadActionImageButton" - android:src="@android:drawable/star_big_off"/> - - <ImageButton - android:id="@+id/download_bookmark" - style="@style/DownloadActionImageButton" - android:src="?attr/bookmark"/> - - <ImageButton - android:id="@+id/download_rating_good" - style="@style/DownloadActionImageButton" - android:src="?attr/rating_good"/> - </LinearLayout> - </RelativeLayout> - - <include layout="@layout/download_playlist"/> - - </github.daneren2005.dsub.view.MyViewFlipper> - - <TextView - android:id="@+id/download_song_title" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_centerHorizontal="true" - android:layout_marginLeft="12dip" - android:layout_marginRight="12dip" - android:singleLine="true" - android:ellipsize="end" - android:gravity="center_horizontal" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="?android:textColorPrimary" - android:layout_above="@+id/download_status"/> - - <TextView - android:id="@+id/download_status" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:gravity="center_horizontal" - android:layout_marginBottom="8dip" - android:layout_marginLeft="12dip" - android:layout_marginRight="12dip" - android:singleLine="true" - android:ellipsize="end" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="?android:textColorSecondary" - android:layout_above="@+id/download_media_buttons_wrapper"/> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/download_layout" + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <github.daneren2005.dsub.view.RecyclingImageView + android:id="@+id/download_album_art_image" + android:src="@drawable/unknown_album_large" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1" + android:scaleType="fitCenter"/> + + <RelativeLayout + android:id="@+id/download_control_layout" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_weight="1" + android:background="@android:color/transparent"> + + <ViewFlipper + android:id="@+id/download_playlist_flipper" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_above="@+id/download_song_title"> + + <RelativeLayout + android:id="@+id/download_other_controls_wrapper" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:orientation="vertical"> <LinearLayout - android:id="@+id/download_media_buttons_wrapper" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_above="@+id/download_slider_wrapper"> - - <include layout="@layout/download_media_buttons"/> - </LinearLayout> - - <LinearLayout - android:id="@+id/download_slider_wrapper" - android:layout_width="fill_parent" + android:id="@+id/download_other_controls_layout" + android:orientation="horizontal" + android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_centerHorizontal="true" android:layout_alignParentBottom="true"> - <include layout="@layout/download_slider"/> + <ImageButton + android:id="@+id/download_rating_bad" + style="@style/DownloadActionImageButton" + android:src="?attr/rating_bad"/> + + <ImageButton + android:id="@+id/download_star" + style="@style/DownloadActionImageButton" + android:src="@android:drawable/star_big_off"/> + + <ImageButton + android:id="@+id/download_playback_speed" + style="@style/DownloadActionImageButton" + android:src="?attr/playback_speed"/> + + <ImageButton + android:id="@+id/download_bookmark" + style="@style/DownloadActionImageButton" + android:src="?attr/bookmark"/> + + <ImageButton + android:id="@+id/download_rating_good" + style="@style/DownloadActionImageButton" + android:src="?attr/rating_good"/> </LinearLayout> - </RelativeLayout> + <include layout="@layout/download_playlist"/> + + </ViewFlipper> + + <TextView + android:id="@+id/download_song_title" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:layout_marginLeft="12dip" + android:layout_marginRight="12dip" + android:singleLine="true" + android:ellipsize="end" + android:gravity="center_horizontal" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="?android:textColorPrimary" + android:layout_above="@+id/download_status"/> + + <TextView + android:id="@+id/download_status" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:gravity="center_horizontal" + android:layout_marginBottom="8dip" + android:layout_marginLeft="12dip" + android:layout_marginRight="12dip" + android:singleLine="true" + android:ellipsize="end" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="?android:textColorSecondary" + android:layout_above="@+id/download_media_buttons_wrapper"/> + + <LinearLayout + android:id="@+id/download_media_buttons_wrapper" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_above="@+id/download_slider_wrapper"> + + <include layout="@layout/download_media_buttons"/> + </LinearLayout> + + <LinearLayout + android:id="@+id/download_slider_wrapper" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true"> + + <include layout="@layout/download_slider"/> </LinearLayout> - </LinearLayout> -</FrameLayout> + </RelativeLayout> +</LinearLayout> diff --git a/app/src/main/res/layout-port/download.xml b/app/src/main/res/layout-port/download.xml index 899b46b7..39b5e5e9 100644 --- a/app/src/main/res/layout-port/download.xml +++ b/app/src/main/res/layout-port/download.xml @@ -4,57 +4,50 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/download_layout" - android:orientation="vertical" + <LinearLayout + android:id="@+id/download_layout" + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent"> + + <ViewFlipper + android:id="@+id/download_playlist_flipper" android:layout_width="fill_parent" - android:layout_height="fill_parent"> - - <github.daneren2005.dsub.view.MyViewFlipper - android:id="@+id/download_playlist_flipper" - android:layout_width="fill_parent" - android:layout_height="0dip" - android:layout_weight="1"> - - <RelativeLayout - android:id="@+id/download_album_art_layout" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_weight="1" - android:background="@android:color/transparent"> - - <FrameLayout android:orientation="vertical" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentTop="true"> - - <github.daneren2005.dsub.view.RecyclingImageView - android:id="@+id/download_album_art_image" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:scaleType="fitCenter" - android:layout_gravity="center_horizontal|top"/> - - <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/download_overlay_buttons" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:background="@color/overlayColor" - android:layout_gravity="center_horizontal|bottom" - android:visibility="invisible"> - - <LinearLayout + android:layout_height="0dip" + android:layout_weight="1"> + + <LinearLayout + android:id="@+id/download_album_art_layout" + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="@android:color/transparent"> + + <FrameLayout + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1"> + + <FrameLayout android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <github.daneren2005.dsub.view.RecyclingImageView + android:id="@+id/download_album_art_image" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_centerHorizontal="true"> + android:scaleType="fitCenter" + android:layout_gravity="center_horizontal|top"/> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/download_other_controls_layout" - android:orientation="horizontal" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal"> + <LinearLayout + android:id="@+id/download_overlay_buttons" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal|bottom" + android:background="@color/overlayColor" + android:visibility="invisible" + android:gravity="center" + android:orientation="horizontal"> <ImageButton android:id="@+id/download_rating_bad" @@ -67,6 +60,11 @@ android:src="@drawable/ic_toggle_star_outline_dark"/> <ImageButton + android:id="@+id/download_playback_speed" + style="@style/DownloadActionImageButton" + android:src="@drawable/ic_action_playback_speed_dark"/> + + <ImageButton android:id="@+id/download_bookmark" style="@style/DownloadActionImageButton" android:src="@drawable/ic_menu_bookmark_dark"/> @@ -75,44 +73,39 @@ android:id="@+id/download_rating_good" style="@style/DownloadActionImageButton" android:src="@drawable/ic_action_rating_good_dark"/> - </LinearLayout> </LinearLayout> - </RelativeLayout> + </FrameLayout> </FrameLayout> <TextView - android:id="@+id/download_status" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_centerHorizontal="true" - android:layout_marginLeft="16dip" - android:layout_marginRight="16dip" - android:singleLine="true" - android:ellipsize="end" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="?android:textColorSecondary"/> + android:id="@+id/download_status" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_marginLeft="16dip" + android:layout_marginRight="16dip" + android:layout_marginTop="6dp" + android:singleLine="true" + android:ellipsize="end" + style="?attr/actionbarSubtitleStyle" + android:textColor="?android:textColorSecondary"/> <TextView - android:id="@+id/download_song_title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_horizontal" - android:layout_above="@+id/download_status" - android:layout_centerHorizontal="true" - android:layout_marginLeft="16dip" - android:layout_marginRight="16dip" - android:singleLine="true" - android:textColor="?android:textColorPrimary" - android:textStyle="bold" - android:textSize="18sp" - android:ellipsize="end"/> - - </RelativeLayout> + android:id="@+id/download_song_title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_horizontal" + android:layout_marginLeft="16dip" + android:layout_marginRight="16dip" + android:singleLine="true" + android:textStyle="bold" + style="?attr/actionbarTitleStyle" + android:textColor="?android:textColorPrimary"/> + </LinearLayout> <include layout="@layout/download_playlist"/> - </github.daneren2005.dsub.view.MyViewFlipper> + </ViewFlipper> <include layout="@layout/download_media_buttons"/> diff --git a/app/src/main/res/layout/abstract_fragment_activity.xml b/app/src/main/res/layout/abstract_fragment_activity.xml index d41b0115..ae6647c4 100644 --- a/app/src/main/res/layout/abstract_fragment_activity.xml +++ b/app/src/main/res/layout/abstract_fragment_activity.xml @@ -44,7 +44,7 @@ android:layout_width="match_parent" android:elevation="4dp" android:visibility="gone" - app:theme="?attr/actionbarThemeStyle" + android:theme="?attr/actionbarThemeStyle" app:popupTheme="?attr/actionbarPopupStyle"/> <LinearLayout @@ -60,7 +60,7 @@ android:layout_width="?attr/actionBarSize" android:layout_height="?attr/actionBarSize" android:layout_gravity="left|center" - android:scaleType="fitStart"/> + android:scaleType="fitCenter"/> <LinearLayout android:layout_width="0dp" @@ -105,6 +105,13 @@ <ImageButton style="@style/PlaybackControl.BottomBar" + android:id="@+id/download_rewind" + android:src="?attr/actionbar_rewind" + android:padding="2dp" + android:visibility="gone"/> + + <ImageButton + style="@style/PlaybackControl.BottomBar" android:id="@+id/download_previous" android:src="?attr/actionbar_backward" android:padding="2dp"/> @@ -119,11 +126,18 @@ android:id="@+id/download_next" android:src="?attr/actionbar_forward" android:padding="2dp"/> + + <ImageButton + style="@style/PlaybackControl.BottomBar" + android:id="@+id/download_fastforward" + android:src="?attr/actionbar_fastforward" + android:padding="2dp" + android:visibility="gone"/> </LinearLayout> </LinearLayout> </FrameLayout> - <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + <FrameLayout android:id="@+id/now_playing_fragment_container" android:layout_width="match_parent" android:layout_height="0dp" diff --git a/app/src/main/res/layout/abstract_recycler_fragment.xml b/app/src/main/res/layout/abstract_recycler_fragment.xml index 0e0c87f4..0a443ed6 100644 --- a/app/src/main/res/layout/abstract_recycler_fragment.xml +++ b/app/src/main/res/layout/abstract_recycler_fragment.xml @@ -19,7 +19,10 @@ android:id="@+id/fragment_recycler" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:scrollbars="vertical"/> + android:scrollbars="vertical" + android:paddingRight="@dimen/FastScroller.LeftAlignedMargin" + android:layout_marginRight="@dimen/FastScroller.NormalBarMargin" + android:scrollbarStyle="outsideOverlay"/> <github.daneren2005.dsub.view.FastScroller android:id="@+id/fragment_fast_scroller" diff --git a/app/src/main/res/layout/actionbar_spinner.xml b/app/src/main/res/layout/actionbar_spinner.xml index 22fa7f43..f719a67c 100644 --- a/app/src/main/res/layout/actionbar_spinner.xml +++ b/app/src/main/res/layout/actionbar_spinner.xml @@ -1,14 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="fill_parent" +<Spinner xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/spinner" + android:layout_width="wrap_content" android:layout_height="fill_parent" - android:gravity="fill_horizontal" > - - <Spinner - android:id="@+id/spinner" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:prompt="@string/common.appname" - style="?attr/android:spinnerItemStyle"/> -</RelativeLayout> + android:prompt="@string/common.appname" + style="?attr/android:spinnerItemStyle" + android:overlapAnchor="false"/>
\ No newline at end of file diff --git a/app/src/main/res/layout/album_cell_item.xml b/app/src/main/res/layout/album_cell_item.xml index f6693a7f..4ad32409 100644 --- a/app/src/main/res/layout/album_cell_item.xml +++ b/app/src/main/res/layout/album_cell_item.xml @@ -1,90 +1,98 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" +<github.daneren2005.dsub.view.CardView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/selectableItemBackground"> + android:layout_margin="2dp"> - <RelativeLayout + <LinearLayout + android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="1"> + android:layout_height="match_parent" + android:background="?attr/selectableItemBackground"> - <github.daneren2005.dsub.view.SquareImageView - android:id="@+id/album_coverart" + <RelativeLayout android:layout_width="match_parent" - android:layout_height="match_parent"/> + android:layout_height="0dp" + android:layout_weight="1"> - <RatingBar - android:id="@+id/album_rating" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:isIndicator="true" - android:layout_centerHorizontal="true" - android:numStars="5" - style="@android:style/Widget.Holo.RatingBar.Small" - android:layout_alignParentBottom="true" - android:visibility="gone"/> - </RelativeLayout> + <github.daneren2005.dsub.view.SquareImageView + android:id="@+id/album_coverart" + android:layout_width="match_parent" + android:layout_height="match_parent"/> - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingTop="4dp" - android:paddingLeft="2dp"> + <RatingBar + android:id="@+id/album_rating" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:isIndicator="true" + android:layout_centerHorizontal="true" + android:numStars="5" + style="@android:style/Widget.Holo.RatingBar.Small" + android:layout_alignParentBottom="true" + android:visibility="gone"/> + </RelativeLayout> <LinearLayout - android:layout_width="0dp" + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:gravity="center_vertical" - android:orientation="vertical"> - - <TextView - android:id="@+id/album_title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" - android:singleLine="true" - android:ellipsize="marquee" - android:text="@string/search.albums" - android:textColor="?android:textColorPrimary"/> + android:orientation="horizontal" + android:paddingTop="4dp" + android:paddingBottom="4dp" + android:paddingLeft="2dp"> <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content"> + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:gravity="center_vertical" + android:orientation="vertical"> <TextView - android:id="@+id/album_artist" - android:layout_width="0dp" - android:layout_weight="1" + android:id="@+id/album_title" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="12sp" - android:textColor="?android:textColorSecondary" + android:textAppearance="?android:attr/textAppearanceSmall" android:singleLine="true" - android:text="@string/search.artists"/> + android:ellipsize="marquee" + android:text="@string/search.albums" + android:textColor="?android:textColorPrimary" + android:paddingLeft="@dimen/Card.TextLeftPadding"/> + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content"> - <ImageButton - android:id="@+id/album_star" - android:layout_width="@dimen/Star.Small" - android:layout_height="@dimen/Star.Small" - android:scaleType="fitCenter" - android:layout_gravity="right|center_vertical" - android:background="@android:color/transparent" - android:focusable="false" - android:visibility="gone"/> + <TextView + android:id="@+id/album_artist" + android:layout_width="0dp" + android:layout_weight="1" + android:layout_height="wrap_content" + android:textSize="12sp" + android:textColor="?android:textColorSecondary" + android:singleLine="true" + android:text="@string/search.artists" + android:paddingLeft="@dimen/Card.TextLeftPadding"/> + + <ImageButton + android:id="@+id/album_star" + android:layout_width="@dimen/Star.Small" + android:layout_height="@dimen/Star.Small" + android:scaleType="fitCenter" + android:layout_gravity="right|center_vertical" + android:background="@android:color/transparent" + android:focusable="false" + android:visibility="gone"/> + </LinearLayout> </LinearLayout> + + <ImageView + android:id="@+id/item_more" + android:src="?attr/download_none" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right|center_vertical" + style="@style/MoreButton"/> </LinearLayout> - <ImageView - android:id="@+id/item_more" - android:src="?attr/download_none" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right|center_vertical" - android:paddingRight="2dp" - style="@style/BasicButton"/> </LinearLayout> - -</LinearLayout>
\ No newline at end of file +</github.daneren2005.dsub.view.CardView>
\ No newline at end of file diff --git a/app/src/main/res/layout/basic_cell_item.xml b/app/src/main/res/layout/basic_cell_item.xml index f522b196..a10fc4be 100644 --- a/app/src/main/res/layout/basic_cell_item.xml +++ b/app/src/main/res/layout/basic_cell_item.xml @@ -1,39 +1,45 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" +<github.daneren2005.dsub.view.CardView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/selectableItemBackground"> - - <github.daneren2005.dsub.view.SquareImageView - android:id="@+id/item_art" - android:layout_width="match_parent" - android:layout_height="match_parent"/> + android:layout_margin="2dp"> <LinearLayout + android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingTop="4dp" - android:paddingLeft="2dp"> + android:layout_height="match_parent" + android:background="?attr/selectableItemBackground"> - <TextView - android:id="@+id/item_name" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:textAppearance="?android:attr/textAppearanceMedium" - android:singleLine="true" - android:ellipsize="marquee" - android:textColor="?android:textColorPrimary"/> + <github.daneren2005.dsub.view.SquareImageView + android:id="@+id/item_art" + android:layout_width="match_parent" + android:layout_height="match_parent"/> - <ImageView - android:id="@+id/item_more" - android:src="?attr/download_none" - android:layout_width="wrap_content" + <LinearLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="right|center_vertical" - android:paddingRight="2dp" - style="@style/BasicButton"/> + android:orientation="horizontal" + android:paddingTop="4dp" + android:paddingLeft="2dp"> + + <TextView + android:id="@+id/item_name" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:textAppearance="?android:attr/textAppearanceMedium" + android:singleLine="true" + android:ellipsize="marquee" + android:textColor="?android:textColorPrimary" + android:paddingLeft="@dimen/Card.TextLeftPadding"/> + + <ImageView + android:id="@+id/item_more" + android:src="?attr/download_none" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right|center_vertical" + style="@style/MoreButton"/> + </LinearLayout> </LinearLayout> -</LinearLayout>
\ No newline at end of file +</github.daneren2005.dsub.view.CardView>
\ No newline at end of file diff --git a/app/src/main/res/layout/cache_location_buttons.xml b/app/src/main/res/layout/cache_location_buttons.xml new file mode 100644 index 00000000..31e12642 --- /dev/null +++ b/app/src/main/res/layout/cache_location_buttons.xml @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center"> + + <Button + android:id="@+id/location_internal" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/settings.cache_location_internal"/> + + <Button + android:id="@+id/location_external" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/settings.cache_location_external"/> +</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/change_email.xml b/app/src/main/res/layout/change_email.xml index 87d297be..d78edd13 100644 --- a/app/src/main/res/layout/change_email.xml +++ b/app/src/main/res/layout/change_email.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content"> diff --git a/app/src/main/res/layout/change_password.xml b/app/src/main/res/layout/change_password.xml index d8043c05..68861b0b 100644 --- a/app/src/main/res/layout/change_password.xml +++ b/app/src/main/res/layout/change_password.xml @@ -4,7 +4,30 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + <LinearLayout + android:id="@+id/current_password_layout" + android:orientation="horizontal" + android:layout_width="fill_parent" + android:layout_height="wrap_content"> + + <TextView + android:id="@+id/current_password_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="4dp" + android:textSize="20dp" + android:text="@string/admin.change_password_current_label" + android:textColor="?android:textColorPrimary"/> + <EditText + android:id="@+id/current_password" + android:inputType="textPassword" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_marginLeft="4dp" /> + </LinearLayout> + + <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content"> diff --git a/app/src/main/res/layout/confirm_password.xml b/app/src/main/res/layout/confirm_password.xml index 9ec61c0a..d74eecfd 100644 --- a/app/src/main/res/layout/confirm_password.xml +++ b/app/src/main/res/layout/confirm_password.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content"> diff --git a/app/src/main/res/layout/create_bookmark.xml b/app/src/main/res/layout/create_bookmark.xml index d6f077c3..22d96227 100644 --- a/app/src/main/res/layout/create_bookmark.xml +++ b/app/src/main/res/layout/create_bookmark.xml @@ -3,7 +3,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content"> diff --git a/app/src/main/res/layout/create_podcast.xml b/app/src/main/res/layout/create_podcast.xml index 04e74ec3..a5e66792 100644 --- a/app/src/main/res/layout/create_podcast.xml +++ b/app/src/main/res/layout/create_podcast.xml @@ -3,7 +3,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content"> diff --git a/app/src/main/res/layout/create_user.xml b/app/src/main/res/layout/create_user.xml index b2d8f6e0..7d77ade9 100644 --- a/app/src/main/res/layout/create_user.xml +++ b/app/src/main/res/layout/create_user.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content"> @@ -26,7 +26,7 @@ android:textColor="?android:textColorPrimary"/> </LinearLayout> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content"> @@ -48,7 +48,7 @@ android:textColor="?android:textColorPrimary"/> </LinearLayout> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content"> diff --git a/app/src/main/res/layout/download_media_buttons.xml b/app/src/main/res/layout/download_media_buttons.xml index 58fda5c0..0610c5f9 100644 --- a/app/src/main/res/layout/download_media_buttons.xml +++ b/app/src/main/res/layout/download_media_buttons.xml @@ -21,6 +21,14 @@ android:layout_centerVertical="true" /> + <github.daneren2005.dsub.view.AutoRepeatButton + style="@style/PlaybackControl.Large" + android:id="@+id/download_rewind" + android:src="?attr/media_button_rewind" + android:layout_toLeftOf="@+id/download_pause" + android:layout_centerVertical="true" + android:visibility="invisible"/> + <ImageButton style="@style/PlaybackControl.Large" android:id="@+id/download_pause" @@ -44,6 +52,14 @@ android:layout_centerInParent="true" /> + <github.daneren2005.dsub.view.AutoRepeatButton + style="@style/PlaybackControl.Large" + android:id="@+id/download_fastforward" + android:src="?attr/media_button_fastforward" + android:layout_toRightOf="@+id/download_start" + android:layout_centerVertical="true" + android:visibility="invisible"/> + <github.daneren2005.dsub.view.AutoRepeatButton style="@style/PlaybackControl.Small" android:id="@+id/download_next" diff --git a/app/src/main/res/layout/download_playlist.xml b/app/src/main/res/layout/download_playlist.xml index db74f8ca..161056db 100644 --- a/app/src/main/res/layout/download_playlist.xml +++ b/app/src/main/res/layout/download_playlist.xml @@ -28,7 +28,9 @@ android:id="@+id/download_list" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:scrollbars="vertical"/> + android:scrollbars="vertical" + android:paddingRight="@dimen/FastScroller.LeftAlignedMargin" + android:layout_marginRight="@dimen/FastScroller.NormalBarMargin"/> <github.daneren2005.dsub.view.FastScroller android:id="@+id/download_fast_scroller" diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml index 86222f43..3a9a2d49 100644 --- a/app/src/main/res/layout/drawer_header.xml +++ b/app/src/main/res/layout/drawer_header.xml @@ -4,7 +4,7 @@ android:layout_height="178dp" android:orientation="vertical" android:weightSum="1" - android:background="@drawable/drawer_header"> + android:background="?attr/drawerHeaderBackground"> <LinearLayout android:layout_width="match_parent" diff --git a/app/src/main/res/layout/newest_episode_header.xml b/app/src/main/res/layout/expandable_header.xml index bd78275e..bd78275e 100644 --- a/app/src/main/res/layout/newest_episode_header.xml +++ b/app/src/main/res/layout/expandable_header.xml diff --git a/app/src/main/res/layout/fast_scroller.xml b/app/src/main/res/layout/fast_scroller.xml index b2e244e3..4d37ca63 100644 --- a/app/src/main/res/layout/fast_scroller.xml +++ b/app/src/main/res/layout/fast_scroller.xml @@ -18,8 +18,8 @@ <ImageView android:id="@+id/fastscroller_handle" android:layout_width="wrap_content" - android:layout_marginRight="8dp" - android:layout_marginLeft="8dp" + android:layout_marginRight="@dimen/FastScroller.RightMargin" + android:layout_marginLeft="12dp" android:layout_height="wrap_content" android:src="@drawable/fast_scroller_handle"/> </merge>
\ No newline at end of file diff --git a/app/src/main/res/layout/home.xml b/app/src/main/res/layout/home.xml deleted file mode 100644 index 043886a2..00000000 --- a/app/src/main/res/layout/home.xml +++ /dev/null @@ -1,23 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/home_layout" - android:orientation="vertical" - android:layout_width="fill_parent" - android:layout_height="fill_parent"> - - <View - android:layout_width="fill_parent" - android:layout_height="1px" - android:background="?attr/colorPrimary"/> - - <ListView - android:id="@+id/main_list" - android:layout_width="fill_parent" - android:layout_height="0px" - android:layout_weight="1"/> - - <View android:id="@+id/main_dummy" - android:layout_width="0px" - android:layout_height="0px"/> -</LinearLayout> - diff --git a/app/src/main/res/layout/notification.xml b/app/src/main/res/layout/notification.xml index 4a89db49..0ab5a884 100644 --- a/app/src/main/res/layout/notification.xml +++ b/app/src/main/res/layout/notification.xml @@ -13,7 +13,6 @@ android:gravity="center" /> <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="0dip" android:layout_height="wrap_content" android:layout_weight="1" diff --git a/app/src/main/res/layout/notification_expanded.xml b/app/src/main/res/layout/notification_expanded.xml index 7b378e12..a1586214 100644 --- a/app/src/main/res/layout/notification_expanded.xml +++ b/app/src/main/res/layout/notification_expanded.xml @@ -12,7 +12,6 @@ android:gravity="center" /> <LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_weight="0.0" diff --git a/app/src/main/res/layout/progress.xml b/app/src/main/res/layout/progress.xml deleted file mode 100644 index 8a299d63..00000000 --- a/app/src/main/res/layout/progress.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="horizontal" - android:layout_weight="1" - android:layout_width="0dip" - android:layout_height="fill_parent" - android:padding="10dp"> - - <ProgressBar - android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:layout_marginRight="10dp"/> - - <TextView - android:id="@+id/progress_message" - android:text="@string/progress.wait" - android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:textColor="?android:textColorPrimary"/> -</LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/seekbar_preference.xml b/app/src/main/res/layout/seekbar_preference.xml index 74dad4cd..e0c9bb31 100644 --- a/app/src/main/res/layout/seekbar_preference.xml +++ b/app/src/main/res/layout/seekbar_preference.xml @@ -9,7 +9,7 @@ android:padding="5dip" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:gravity="right" + android:gravity="center" android:textColor="?android:textColorPrimary"/> <SeekBar android:id="@+id/seek_bar" diff --git a/app/src/main/res/layout/select_album_header.xml b/app/src/main/res/layout/select_album_header.xml index 5b2294f0..891db891 100644 --- a/app/src/main/res/layout/select_album_header.xml +++ b/app/src/main/res/layout/select_album_header.xml @@ -121,7 +121,7 @@ android:contentDescription="@null"/> </RelativeLayout> - <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + <FrameLayout android:id="@+id/header_progress" android:layout_width="fill_parent" android:layout_height="fill_parent" diff --git a/app/src/main/res/layout/set_playback_speed.xml b/app/src/main/res/layout/set_playback_speed.xml new file mode 100644 index 00000000..c85719bb --- /dev/null +++ b/app/src/main/res/layout/set_playback_speed.xml @@ -0,0 +1,66 @@ +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="horizontal" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:background="?android:colorBackground" + > + + + <LinearLayout + android:id="@+id/playback_speed_buttons" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:gravity="center" + android:orientation="horizontal" + > + + <Button + android:id="@+id/playback_speed_normal" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="1.0x" + android:tag="1.0"/> + <Button + android:id="@+id/playback_speed_one_half" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:tag="1.5" + android:text="1.5x"/> + + <Button + android:id="@+id/playback_speed_double" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:tag="2.0" + android:text="2.0x"/> + + + <Button + android:id="@+id/playback_speed_triple" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="3.0x" + android:tag="3.0"/> + </LinearLayout> + + <TextView + android:id="@+id/playback_speed_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="8dp" + android:textSize="20dp" + android:paddingRight="10px" + android:textColor="?android:textColorPrimary" + android:layout_below="@+id/playback_speed_buttons"/> + + <SeekBar + android:id="@+id/playback_speed_bar" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:max="25" + android:layout_toRightOf="@+id/playback_speed_label" + android:layout_below="@+id/playback_speed_buttons" + /> + +</RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/settings_activity.xml b/app/src/main/res/layout/settings_activity.xml index 3baa30d4..bdcc4a23 100644 --- a/app/src/main/res/layout/settings_activity.xml +++ b/app/src/main/res/layout/settings_activity.xml @@ -10,7 +10,7 @@ android:layout_width="match_parent" android:background="?attr/actionbarBackgroundColor" android:elevation="4dp" - app:theme="?attr/actionbarThemeStyle" + android:theme="?attr/actionbarThemeStyle" app:popupTheme="?attr/actionbarPopupStyle"/> <FrameLayout diff --git a/app/src/main/res/layout/shuffle_dialog.xml b/app/src/main/res/layout/shuffle_dialog.xml index 63778ed7..012c220f 100644 --- a/app/src/main/res/layout/shuffle_dialog.xml +++ b/app/src/main/res/layout/shuffle_dialog.xml @@ -3,7 +3,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content"> @@ -26,7 +26,7 @@ android:hint="@string/shuffle.startYear" /> </LinearLayout> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content"> @@ -49,7 +49,7 @@ android:hint="@string/shuffle.endYear" /> </LinearLayout> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content"> diff --git a/app/src/main/res/layout/song_list_item.xml b/app/src/main/res/layout/song_list_item.xml index 6bf025b8..d7c8d312 100644 --- a/app/src/main/res/layout/song_list_item.xml +++ b/app/src/main/res/layout/song_list_item.xml @@ -17,25 +17,36 @@ android:layout_height="wrap_content" android:layout_gravity="center_vertical"> + <TextView + android:id="@+id/song_track" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="left|top" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="?android:textColorPrimary" + android:paddingLeft="6dip" + android:paddingRight="6dip" + android:drawablePadding="6dip"/> + <TextView android:id="@+id/song_title" android:layout_width="0dip" android:layout_height="wrap_content" android:layout_weight="1" - android:layout_gravity="left|center_vertical" + android:layout_gravity="left|top" android:textAppearance="?android:attr/textAppearanceMedium" android:singleLine="true" android:ellipsize="marquee" - android:drawablePadding="6dip" android:paddingLeft="6dip" android:paddingRight="6dip" + android:drawablePadding="6dip" android:textColor="?android:textColorPrimary"/> <ImageButton android:id="@+id/song_bookmark" - android:layout_width="24dp" - android:layout_height="24dp" - android:layout_gravity="right|center_vertical" + android:layout_width="@dimen/SongStatusIcon" + android:layout_height="@dimen/SongStatusIcon" + android:layout_gravity="right|top" android:background="@null" android:focusable="false" android:scaleType="fitCenter" @@ -46,7 +57,17 @@ android:layout_width="@dimen/Star.Small" android:layout_height="@dimen/Star.Small" android:scaleType="fitCenter" - android:layout_gravity="right|center_vertical" + android:layout_gravity="right|top" + android:background="@null" + android:focusable="false" + android:visibility="gone"/> + + <ImageButton + android:id="@+id/song_played" + android:layout_width="@dimen/SongStatusIcon" + android:layout_height="@dimen/SongStatusIcon" + android:scaleType="fitCenter" + android:layout_gravity="right|top" android:background="@null" android:focusable="false" android:visibility="gone"/> @@ -55,15 +76,15 @@ android:id="@+id/song_status" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="right|center_vertical" + android:layout_gravity="right|top" android:drawablePadding="1dip" android:paddingRight="2dip"/> <ImageView android:id="@+id/song_status_icon" - android:layout_width="24dip" - android:layout_height="24dip" - android:layout_gravity="center_vertical" + android:layout_width="@dimen/SongStatusIcon" + android:layout_height="@dimen/SongStatusIcon" + android:layout_gravity="top" android:src="?attr/downloading" android:visibility="gone"/> </LinearLayout> diff --git a/app/src/main/res/layout/start_timer.xml b/app/src/main/res/layout/start_timer.xml index 59bd60e3..61a72233 100644 --- a/app/src/main/res/layout/start_timer.xml +++ b/app/src/main/res/layout/start_timer.xml @@ -18,5 +18,5 @@ android:id="@+id/timer_length_bar" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:max="97"/> + android:max="92"/> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/update_playlist.xml b/app/src/main/res/layout/update_playlist.xml index cc7e5ee6..f9cc6a90 100644 --- a/app/src/main/res/layout/update_playlist.xml +++ b/app/src/main/res/layout/update_playlist.xml @@ -3,7 +3,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content"> @@ -26,7 +26,7 @@ android:textColor="?android:textColorPrimary"/> </LinearLayout> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content"> @@ -49,7 +49,7 @@ android:hint="@string/common.comment" /> </LinearLayout> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content"> diff --git a/app/src/main/res/layout/update_share.xml b/app/src/main/res/layout/update_share.xml index ef44e304..0d06e00d 100644 --- a/app/src/main/res/layout/update_share.xml +++ b/app/src/main/res/layout/update_share.xml @@ -3,7 +3,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content"> @@ -26,7 +26,7 @@ android:hint="@string/common.name" /> </LinearLayout> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content"> @@ -48,7 +48,7 @@ android:calendarViewShown="false"/> </LinearLayout> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + <LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content"> diff --git a/app/src/main/res/menu/abstract_top_menu.xml b/app/src/main/res/menu/abstract_top_menu.xml index 7c8d414d..b768879d 100644 --- a/app/src/main/res/menu/abstract_top_menu.xml +++ b/app/src/main/res/menu/abstract_top_menu.xml @@ -5,7 +5,8 @@ android:id="@+id/menu_global_search" android:icon="?attr/search" android:title="@string/menu.search" - compat:showAsAction="always|withText"/> + compat:actionViewClass="android.support.v7.widget.SearchView" + compat:showAsAction="always|collapseActionView"/> <group android:id="@+id/not_touchscreen"> <item diff --git a/app/src/main/res/menu/drawer_menu.xml b/app/src/main/res/menu/drawer_menu.xml deleted file mode 100644 index b3e70cfa..00000000 --- a/app/src/main/res/menu/drawer_menu.xml +++ /dev/null @@ -1,14 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:compat="http://schemas.android.com/apk/res-auto"> - - <item - android:id="@+id/menu_search" - android:icon="?attr/search" - android:title="@string/menu.search" - compat:showAsAction="always|withText"/> - - <item - android:id="@+id/menu_exit" - android:title="@string/menu.exit"/> -</menu> diff --git a/app/src/main/res/menu/drawer_navigation.xml b/app/src/main/res/menu/drawer_navigation.xml index bd309455..32de5cd5 100644 --- a/app/src/main/res/menu/drawer_navigation.xml +++ b/app/src/main/res/menu/drawer_navigation.xml @@ -22,6 +22,10 @@ android:icon="?attr/drawerBookmarks" android:title="@string/button_bar.bookmarks"/> <item + android:id="@+id/drawer_internet_radio_stations" + android:icon="?attr/drawerInternetRadioStations" + android:title="@string/button_bar.internet_radio"/> + <item android:id="@+id/drawer_shares" android:icon="?attr/drawerShares" android:title="@string/button_bar.shares"/> diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml index 0970c8ce..b264d4fa 100644 --- a/app/src/main/res/menu/main.xml +++ b/app/src/main/res/menu/main.xml @@ -5,15 +5,16 @@ android:id="@+id/menu_global_search" android:icon="?attr/search" android:title="@string/menu.search" - compat:showAsAction="always|withText"/> + compat:actionViewClass="android.support.v7.widget.SearchView" + compat:showAsAction="ifRoom|collapseActionView"/> <item android:id="@+id/menu_global_shuffle" android:icon="?attr/shuffle" android:title="@string/menu.shuffle" - compat:showAsAction="always|withText"/> + compat:showAsAction="ifRoom|withText"/> - <group android:id="@+id/madsonic"> + <group android:id="@+id/rescan_server"> <item android:id="@+id/menu_rescan" android:title="@string/menu.rescan"/> diff --git a/app/src/main/res/menu/multiselect_media.xml b/app/src/main/res/menu/multiselect_media.xml index 6adb4567..85bb5217 100644 --- a/app/src/main/res/menu/multiselect_media.xml +++ b/app/src/main/res/menu/multiselect_media.xml @@ -34,8 +34,8 @@ android:title="@string/menu.remove_playlist"/> <item - android:id="@+id/menu_unstar" - android:title="@string/common.unstar"/> + android:id="@+id/menu_star" + android:title="@string/common.star"/> <group android:id="@+id/hide_play_next"> <item diff --git a/app/src/main/res/menu/multiselect_nowplaying.xml b/app/src/main/res/menu/multiselect_nowplaying.xml new file mode 100644 index 00000000..9d361bf0 --- /dev/null +++ b/app/src/main/res/menu/multiselect_nowplaying.xml @@ -0,0 +1,27 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:compat="http://schemas.android.com/apk/res-auto"> + <item + android:id="@+id/menu_download" + android:title="@string/common.download" + android:icon="?attr/download" + compat:showAsAction="ifRoom|withText"/> + + <item + android:id="@+id/menu_delete" + android:title="@string/menu.delete_cache" + android:icon="?attr/remove" + compat:showAsAction="ifRoom|withText"/> + + <item + android:id="@+id/menu_cache" + android:title="@string/common.pin"/> + + <item + android:id="@+id/menu_add_playlist" + android:title="@string/menu.add_playlist"/> + + <item + android:id="@+id/menu_star" + android:title="@string/common.star"/> +</menu> diff --git a/app/src/main/res/menu/multiselect_nowplaying_offline.xml b/app/src/main/res/menu/multiselect_nowplaying_offline.xml new file mode 100644 index 00000000..044836c6 --- /dev/null +++ b/app/src/main/res/menu/multiselect_nowplaying_offline.xml @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:compat="http://schemas.android.com/apk/res-auto"> + <item + android:id="@+id/menu_delete" + android:title="@string/menu.delete_cache" + android:icon="?attr/remove" + compat:showAsAction="ifRoom|withText"/> +</menu> diff --git a/app/src/main/res/menu/nowplaying.xml b/app/src/main/res/menu/nowplaying.xml index 60255692..9c198e9a 100644 --- a/app/src/main/res/menu/nowplaying.xml +++ b/app/src/main/res/menu/nowplaying.xml @@ -33,6 +33,11 @@ android:title="@string/equalizer.label" android:checkable="true"/> + <item + android:id="@+id/menu_batch_mode" + android:title="@string/download.batch_mode" + android:checkable="true"/> + <item android:id="@+id/menu_screen_on_off" android:title="@string/download.menu_screen_on" diff --git a/app/src/main/res/menu/nowplaying_context.xml b/app/src/main/res/menu/nowplaying_context.xml index 60d6288e..06f4afcb 100644 --- a/app/src/main/res/menu/nowplaying_context.xml +++ b/app/src/main/res/menu/nowplaying_context.xml @@ -26,7 +26,7 @@ <group android:id="@+id/hide_star"> <item - android:id="@+id/menu_star" + android:id="@+id/song_menu_star" android:title="@string/common.star"/> </group> @@ -44,7 +44,7 @@ <group android:id="@+id/server_1.8"> <item - android:id="@+id/menu_add_playlist" + android:id="@+id/song_menu_add_playlist" android:title="@string/menu.add_playlist"/> </group> </menu> diff --git a/app/src/main/res/menu/nowplaying_context_offline.xml b/app/src/main/res/menu/nowplaying_context_offline.xml index 5f8009ff..14c95ab6 100644 --- a/app/src/main/res/menu/nowplaying_context_offline.xml +++ b/app/src/main/res/menu/nowplaying_context_offline.xml @@ -22,7 +22,7 @@ <group android:id="@+id/hide_star"> <item - android:id="@+id/menu_star" + android:id="@+id/song_menu_star" android:title="@string/common.star"/> </group> </menu> diff --git a/app/src/main/res/menu/nowplaying_offline.xml b/app/src/main/res/menu/nowplaying_offline.xml index bba5ba00..d1f6f706 100644 --- a/app/src/main/res/menu/nowplaying_offline.xml +++ b/app/src/main/res/menu/nowplaying_offline.xml @@ -25,6 +25,11 @@ android:id="@+id/menu_equalizer" android:title="@string/equalizer.label" android:checkable="true"/> + + <item + android:id="@+id/menu_batch_mode" + android:title="@string/download.batch_mode" + android:checkable="true"/> <item android:id="@+id/menu_screen_on_off" diff --git a/app/src/main/res/menu/search.xml b/app/src/main/res/menu/search.xml index e9377d68..b957a1e4 100644 --- a/app/src/main/res/menu/search.xml +++ b/app/src/main/res/menu/search.xml @@ -5,7 +5,8 @@ android:id="@+id/menu_global_search" android:icon="?attr/search" android:title="@string/menu.search" - compat:showAsAction="ifRoom|withText"/> + compat:actionViewClass="android.support.v7.widget.SearchView" + compat:showAsAction="always|collapseActionView"/> <item android:id="@+id/menu_exit" diff --git a/app/src/main/res/menu/select_album_context.xml b/app/src/main/res/menu/select_album_context.xml index e4a901ac..0415da3c 100644 --- a/app/src/main/res/menu/select_album_context.xml +++ b/app/src/main/res/menu/select_album_context.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:id="@+id/album_menu_info" android:title="@string/common.info"/> @@ -47,9 +46,11 @@ android:title="@string/menu.delete_cache"/> </group> - <item - android:id="@+id/album_menu_show_artist" - android:title="@string/menu.show_artist"/> + <group android:id="@+id/hide_show_artist"> + <item + android:id="@+id/album_menu_show_artist" + android:title="@string/menu.show_artist"/> + </group> <group android:id="@+id/hide_star"> <item diff --git a/app/src/main/res/menu/select_album_context_offline.xml b/app/src/main/res/menu/select_album_context_offline.xml index c10f2c62..37e2ae66 100644 --- a/app/src/main/res/menu/select_album_context_offline.xml +++ b/app/src/main/res/menu/select_album_context_offline.xml @@ -35,6 +35,12 @@ android:title="@string/menu.delete_cache"/> </group> + <group android:id="@+id/hide_show_artist"> + <item + android:id="@+id/album_menu_show_artist" + android:title="@string/menu.show_artist"/> + </group> + <group android:id="@+id/hide_star"> <item android:id="@+id/album_menu_star" diff --git a/app/src/main/res/menu/select_artist.xml b/app/src/main/res/menu/select_artist.xml index 66ba37ba..e974c28e 100644 --- a/app/src/main/res/menu/select_artist.xml +++ b/app/src/main/res/menu/select_artist.xml @@ -1,16 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:compat="http://schemas.android.com/apk/res-auto"> + <item + android:id="@+id/menu_global_search" + android:icon="?attr/search" + android:title="@string/menu.search" + compat:actionViewClass="android.support.v7.widget.SearchView" + compat:showAsAction="ifRoom|collapseActionView"/> + <item android:id="@+id/menu_global_shuffle" android:icon="?attr/shuffle" android:title="@string/menu.shuffle" - compat:showAsAction="always|withText"/> - - <item - android:id="@+id/menu_global_search" - android:icon="?attr/search" - android:title="@string/menu.search" compat:showAsAction="ifRoom|withText"/> <group android:id="@+id/not_touchscreen"> diff --git a/app/src/main/res/menu/select_internet_radio_context.xml b/app/src/main/res/menu/select_internet_radio_context.xml new file mode 100644 index 00000000..e739aec5 --- /dev/null +++ b/app/src/main/res/menu/select_internet_radio_context.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/internet_radio_info" + android:title="@string/common.info"/> + +</menu> diff --git a/app/src/main/res/menu/select_podcasts.xml b/app/src/main/res/menu/select_podcasts.xml index 41ad62fa..25bb6188 100644 --- a/app/src/main/res/menu/select_podcasts.xml +++ b/app/src/main/res/menu/select_podcasts.xml @@ -5,13 +5,14 @@ android:id="@+id/menu_global_search" android:icon="?attr/search" android:title="@string/menu.search" - compat:showAsAction="always|withText"/> + compat:actionViewClass="android.support.v7.widget.SearchView" + compat:showAsAction="ifRoom|collapseActionView"/> <item android:id="@+id/menu_add_podcast" android:icon="?attr/add" android:title="@string/menu.add_podcast" - compat:showAsAction="always|withText"/> + compat:showAsAction="ifRoom|withText"/> <group android:id="@+id/not_touchscreen"> <item diff --git a/app/src/main/res/menu/select_song_context.xml b/app/src/main/res/menu/select_song_context.xml index 34ea27a6..46eaaa38 100644 --- a/app/src/main/res/menu/select_song_context.xml +++ b/app/src/main/res/menu/select_song_context.xml @@ -1,11 +1,25 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:compat="http://schemas.android.com/apk/res-auto"> - +<menu xmlns:android="http://schemas.android.com/apk/res/android"> <item android:id="@+id/song_menu_info" - android:title="@string/common.info" - /> + android:title="@string/common.info"/> + + + <group android:id="@+id/hide_show_artist"> + <item + android:id="@+id/song_menu_show_album" + android:title="@string/download.menu_show_album"/> + + <item + android:id="@+id/song_menu_show_artist" + android:title="@string/menu.show_artist"/> + </group> + + <group android:id="@+id/hide_play_now"> + <item + android:id="@+id/song_menu_play_now" + android:title="@string/common.play_now"/> + </group> <group android:id="@+id/hide_play_next"> <item diff --git a/app/src/main/res/menu/select_song_context_offline.xml b/app/src/main/res/menu/select_song_context_offline.xml index 1c52e792..cc914563 100644 --- a/app/src/main/res/menu/select_song_context_offline.xml +++ b/app/src/main/res/menu/select_song_context_offline.xml @@ -1,11 +1,26 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:compat="http://schemas.android.com/apk/res-auto"> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> <item android:id="@+id/song_menu_info" android:title="@string/common.info"/> + <group android:id="@+id/hide_show_artist"> + <item + android:id="@+id/song_menu_show_album" + android:title="@string/download.menu_show_album"/> + + <item + android:id="@+id/song_menu_show_artist" + android:title="@string/menu.show_artist"/> + </group> + + <group android:id="@+id/hide_play_now"> + <item + android:id="@+id/song_menu_play_now" + android:title="@string/common.play_now"/> + </group> + <group android:id="@+id/hide_play_next"> <item android:id="@+id/song_menu_play_next" diff --git a/app/src/main/res/menu/select_video_context.xml b/app/src/main/res/menu/select_video_context.xml index 95576efc..51301722 100644 --- a/app/src/main/res/menu/select_video_context.xml +++ b/app/src/main/res/menu/select_video_context.xml @@ -1,6 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<menu xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:compat="http://schemas.android.com/apk/res-auto"> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> <item android:id="@+id/song_menu_info" android:title="@string/common.info"/> @@ -30,4 +29,10 @@ android:id="@+id/song_menu_delete" android:title="@string/menu.delete_cache"/> </group> + + <group android:id="@+id/hide_star"> + <item + android:id="@+id/song_menu_star" + android:title="@string/common.star"/> + </group> </menu> diff --git a/app/src/main/res/menu/similar_artists.xml b/app/src/main/res/menu/similar_artists.xml index f6c30fb2..2557381e 100644 --- a/app/src/main/res/menu/similar_artists.xml +++ b/app/src/main/res/menu/similar_artists.xml @@ -13,8 +13,4 @@ android:icon="?attr/shuffle" android:title="@string/menu.shuffle" compat:showAsAction="ifRoom|withText"/> - - <item - android:id="@+id/menu_show_missing" - android:title="@string/menu.show_missing"/> </menu>
\ 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 534a0f75..c43f3aea 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -28,8 +28,7 @@ <string name="button_bar.home">Übersicht</string> <string name="button_bar.browse">Bibliothek</string> - <string name="button_bar.search">Suchen</string> - <string name="button_bar.playlists">Wiedergabeliste</string> + <string name="button_bar.playlists">Wiedergabeliste</string> <string name="button_bar.now_playing">Aktuelle Wiedergabe</string> <string name="button_bar.podcasts">Podcasts</string> <string name="button_bar.bookmarks">Lesezeichen</string> @@ -53,8 +52,7 @@ <br/>Im Optionsmenü deselektiere "Erste Ebene sind Künstler". Dann wird die erste Verzeichnisebene wie Künstlergruppen anstelle von Künstler behandelt. ]]> </string> - <string name="main.select_server">Wähle Server</string> - <string name="main.shuffle">Zufallswiedergabe</string> + <string name="main.shuffle">Zufallswiedergabe</string> <string name="main.offline">Gehe Offline</string> <string name="main.online">Gehe Online</string> <string name="main.settings">Einstellungen</string> @@ -106,7 +104,6 @@ <string name="menu.rate">Setze Bewertung</string> <string name="menu.top_tracks">Last.FM Top Medien</string> <string name="menu.similar_artists">Ähnliche Künstler</string> - <string name="menu.show_missing">Zeige fehlende</string> <string name="menu.start_radio">Starte Radio</string> <string name="menu.first_level_artist">Erste Ebene sind Künstler</string> @@ -126,20 +123,13 @@ <string name="search.artists">Künstler</string> <string name="search.albums">Alben</string> <string name="search.songs">Lieder</string> - <string name="search.more">Zeige mehr</string> - <string name="progress.wait">Bitte warten...</string> + <string name="progress.wait">Bitte warten...</string> <string name="progress.artist_info">Lade Informationen zum Künstler</string> - <string name="music_library.label">Medienbibliothek</string> - <string name="music_library.label_offline">Offline Medien</string> - - <string name="select_album.select">Alle auswählen</string> - <string name="select_album.n_selected">%d Lieder ausgewählt.</string> - <string name="select_album.more">Mehr</string> - <string name="select_album.offline">Offline</string> - <string name="select_album.searching">Suche...</string> - <string name="select_album.no_sdcard">Fehler: Keine SD-Karte verfügbar.</string> + <string name="select_album.n_selected">%d Lieder ausgewählt.</string> + <string name="select_album.offline">Offline</string> + <string name="select_album.no_sdcard">Fehler: Keine SD-Karte verfügbar.</string> <string name="select_album.no_network">Warnung: Kein Netzwerk verfügbar.</string> <string name="select_album.no_room">Warnung: Es sind nur %s verfügbar</string> <string name="select_album.not_licensed">Server ist nicht lizensiert. Testzeitraum läuft ab in %d Tagen.</string> @@ -198,13 +188,9 @@ <string name="download.repeat_off">Keine Wiederholung</string> <string name="download.repeat_all">Wiederhole alle</string> <string name="download.repeat_single">Aktuelles Lied wiederholen</string> - <string name="download.jukebox_on">Fernbedienung aktiviert. Musik wird auf dem Computer abgespielt.</string> - <string name="download.jukebox_off">Fernbedienung deaktiviert. Musik wird auf dem Telefon abgespielt.</string> - <string name="download.jukebox_volume">Lautstärke</string> - <string name="download.jukebox_server_too_old">Fernbedienung wird nicht unterstützt. Aktualisierung des Subsonic-Servers notwendig.</string> + <string name="download.jukebox_server_too_old">Fernbedienung wird nicht unterstützt. Aktualisierung des Subsonic-Servers notwendig.</string> <string name="download.jukebox_offline">Fernbedienung im Offline-Modus nicht verfügbar.</string> <string name="download.jukebox_not_authorized">Fernbedienung ist nicht erlaubt. Bitte aktivieren Sie den Jukebox-Modus unter <b>Nutzer > Einstellungen</b> auf Ihrem Subsonic-Server.</string> - <string name="download.timer_length">Timer:</string> <string name="download.start_timer">Starte Timer</string> <string name="download.need_download">Video muss zuerst heruntergeladen werden</string> <string name="download.no_streaming_player">Stream kann nicht wiedergegeben werden.</string> @@ -411,8 +397,6 @@ <string name="settings.override_system_language">In Englisch anzeigen</string> <string name="settings.override_system_language_summary">Verwende Englisch anstatt Deutsch für DSub. Benötigt einen Neustart der App.</string> <string name="settings.drawer_items_title">Seitenmenü</string> - <string name="settings.play_now_after">Jetzt wiedergeben bis zum Listenende</string> - <string name="settings.play_now_after_summary">\"Jetzt wiedergeben\" im Kontextmenü spielt das ausgewählte Lied und alle in der Liste nachfolgenden Lieder ab (wie in der Web-Schnittstelle des Subsonic-Server)</string> <string name="settings.large_album_art">Große Cover anzeigen</string> <string name="settings.large_album_art_summary">Verwende große Cover zur Anzeige der Alben anstatt einer Liste</string> <string name="settings.admin_enabled">Administration aktiviert</string> @@ -439,15 +423,6 @@ <string name="shuffle.genre">Genre:</string> <string name="shuffle.pick_genre">Wähle ein Genre</string> - <string name="share.info">Eigentümer: %1$s - \nBeschreibung: %2$s - \nURL: %3$s - \nErzeugt: %4$s - \nZuletzt besucht: %5$s - \nAblauf: %6$s - \nBesuchszähler: %7$s - - </string> <string name="share.expires">Ablauf: %s</string> <string name="share.expires_never">nie</string> <string name="share.deleted">Lösche Freigabe %s</string> @@ -499,9 +474,7 @@ <string name="music_service.retry">Ein Netzwerkfehler ist aufgetreten. Versuch %1$d von %2$d.</string> - <string name="background_task.wait">Bitte warten...</string> - <string name="background_task.loading">Lade.</string> - <string name="background_task.no_network">Diese Programm benötigt Netzwerkzugriff. Bitte schalten Sie Wi-Fi oder Mobiles Netzwerk ein.</string> + <string name="background_task.no_network">Diese Programm benötigt Netzwerkzugriff. Bitte schalten Sie Wi-Fi oder Mobiles Netzwerk ein.</string> <string name="background_task.network_error">Ein Netzwerkfehler ist aufgetreten. Bitte prüfen Sie die Serveradresse oder versuchen Sie es später nochmal.</string> <string name="background_task.not_found">Quelle wurde nicht gefunden. Bitte prüfen Sie die Serveradresse.</string> <string name="background_task.parse_error">Ein Fehler ist bei der Kommunikation mit dem Server aufgetreten. Bitte prüfen Sie die Serveradresse und stellen Sie sicher, das Sie der Server mit einem Webbrowser erreichen.</string> @@ -516,8 +489,7 @@ <string name="parser.server_error">Serverfehler: %s</string> <string name="parser.scan_count">%d Einträge gefunden</string> - <string name="select_artist.refresh">Aktualisieren</string> - <string name="select_artist.folder">Wähle Ordner</string> + <string name="select_artist.folder">Wähle Ordner</string> <string name="select_artist.all_folders">Alle Ordner</string> <string name="equalizer.label">Equalizer</string> @@ -537,9 +509,7 @@ <string name="changelog_ok_button">OK</string> <string name="changelog_show_full">Mehr…</string> - <string name="chat.send_a_message">Nachricht senden</string> - - <string name="changelog_version_format" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">Version <xliff:g id="version_name">%s</xliff:g></string> + <string name="chat.send_a_message">Nachricht senden</string> <string name="tasker.start_playing">Starte Wiedergabe</string> <string name="tasker.start_playing_shuffled">Starte Zufallswiedergabe</string> @@ -642,6 +612,7 @@ <string name="settings.keep_played_count_two">2 abgespielte Lieder behalten</string> <string name="settings.keep_played_count_title">Abgespielte Lieder behalten</string> <string name="details.updated">Aktualisiert</string> + <string name="details.last_played">Zuletzt gespielt</string> <string name="details.position">Position</string> <string name="details.song">Lied</string> <string name="button_bar.offline">Offline</string> @@ -656,5 +627,25 @@ <string name="settings.shuffle_by_album.false">Alle Titel mischen</string> <string name="settings.shuffle_by_album.true">Albenreihenfolge mischen</string> <string name="settings.shuffle_by_album">Alben mischen</string> + <string name="common.never">Nie</string> + <string name="details.starred">Favorit</string> + <string name="download.thumbs_up">Gefällt mir</string> + <string name="download.thumbs_down">Gefällt mir nicht</string> + <string name="select_podcasts.channels">Podcastkanäle</string> + <string name="settings.cache_location_external">Externer Speicher</string> + <string name="settings.cache_location_internal">Interner Speicher</string> + <string name="admin.change_password_current_label">Aktuelles Passwort:</string> + <string name="admin.musicFolders">Musikordner</string> + <string name="admin.permissions">Berechtigungen</string> + <string name="details.played_count">Abspielzähler</string> + <string name="details.expiration">Ablauf</string> + <string name="download.playerstate_playing_artist_radio">Künstlerradio</string> + <string name="main.songs_top_played">Am meisten gespielt</string> + <string name="main.songs_frequent">@string/main.albums_frequent</string> + <string name="main.songs_newest">@string/main.albums_newest</string> + <string name="main.songs_recent">@string/main.albums_recent</string> + <string name="menu.similar_artists.missing">Fehlende Künstler</string> + <string name="settings.casting_stream_original">Original streamen</string> + <string name="settings.casting_stream_original_summary">Zum streamen möglichst das Originalformat verwenden.</string> </resources> diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index f56e939e..a5273a50 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -28,8 +28,7 @@ <string name="button_bar.home">Inicio</string> <string name="button_bar.browse">Biblioteca</string> - <string name="button_bar.search">Buscar</string> - <string name="button_bar.playlists">Listas de reproducción</string> + <string name="button_bar.playlists">Listas de reproducción</string> <string name="button_bar.now_playing">Ahora suena</string> <string name="button_bar.podcasts">Podcasts</string> <string name="button_bar.bookmarks">Marcadores</string> @@ -41,8 +40,7 @@ <string name="main.welcome_title">Bienvenido!</string> <string name="main.welcome_text">Bienvenido a DSub! Ahora la aplicación está configurada para usar el servidor de demostración de Subsonic. Cuando configures tu servidor personal (disponible en <b>subsonic.org</b>), accede a <b>Preferencias</b> y cambia la configuración para conectarte.</string> <string name="main.about_title">Acerca de DSub</string> - <string name="main.select_server">Seleccionar servidor</string> - <string name="main.shuffle">Reproducción aleatoria</string> + <string name="main.shuffle">Reproducción aleatoria</string> <string name="main.offline">Modo Offline</string> <string name="main.online">Modo Online</string> <string name="main.settings">Preferencias</string> @@ -96,7 +94,6 @@ <string name="menu.rate">Establecer valoración</string> <string name="menu.top_tracks">Tp Tracks de Last.FM</string> <string name="menu.similar_artists">Artistas similares</string> - <string name="menu.show_missing">Mostrar los que faltan</string> <string name="menu.start_radio">Iniciar radio</string> <string name="playlist.label">Listas de reproducción</string> @@ -115,19 +112,12 @@ <string name="search.artists">Artista</string> <string name="search.albums">Disco</string> <string name="search.songs">Canción</string> - <string name="search.more">Mostrar más</string> - <string name="progress.wait">Espere por favor...</string> + <string name="progress.wait">Espere por favor...</string> - <string name="music_library.label">Biblioteca de medios</string> - <string name="music_library.label_offline">Archivos Offline</string> - - <string name="select_album.select">Seleccionar todo</string> - <string name="select_album.n_selected">Seleccionadas %d canciones</string> - <string name="select_album.more">Más</string> - <string name="select_album.offline">Offline</string> - <string name="select_album.searching">Buscando...</string> - <string name="select_album.no_sdcard">Error: No hay tarjeta SD disponible</string> + <string name="select_album.n_selected">Seleccionadas %d canciones</string> + <string name="select_album.offline">Offline</string> + <string name="select_album.no_sdcard">Error: No hay tarjeta SD disponible</string> <string name="select_album.no_network">Aviso: No hay red disponible</string> <string name="select_album.not_licensed">Servidor sin licencia. Quedan %d días de prueba</string> <string name="select_album.donate_dialog_message">Consigue descargas ilimitadas haciendo una donación a Subsonic</string> @@ -183,13 +173,9 @@ <string name="download.repeat_off">Repetir off</string> <string name="download.repeat_all">Repetir todo</string> <string name="download.repeat_single">Repetir canción</string> - <string name="download.jukebox_on">Control remoto encendido. La música se está reproduciendo en el ordenador.</string> - <string name="download.jukebox_off">Control remoto apagado. La música se está reproduciendo en el dispositivo móvil.</string> - <string name="download.jukebox_volume">Volumen remoto</string> - <string name="download.jukebox_server_too_old">Control remoto no soportado. Por favor, actualice su servidor Subsonic.</string> + <string name="download.jukebox_server_too_old">Control remoto no soportado. Por favor, actualice su servidor Subsonic.</string> <string name="download.jukebox_offline">Control remoto no disponible en modo offline.</string> <string name="download.jukebox_not_authorized">Control remoto no permitido. Por favor, active el modo jukebox en <b>Users > Settings</b> en su servidor Subsonic.</string> - <string name="download.timer_length">Temporizador</string> <string name="download.start_timer">Iniciar temporizador</string> <string name="download.need_download">El vídeo ha de ser descargado antes</string> <string name="download.no_streaming_player">Ningún reproductor puede reproducir este stream</string> @@ -400,8 +386,6 @@ <string name="settings.override_system_language">Sobreescribir idioma del sistema</string> <string name="settings.override_system_language_summary">Mostrar la aplicación en inglés aún teniendo disponible DSub en el idioma del sistema. Probablemente necesite borrar la aplicación de la memoria para efectuar los cambios.</string> <string name="settings.drawer_items_title">Pestañas</string> - <string name="settings.play_now_after">Reproducir ahora - Después</string> - <string name="settings.play_now_after_summary">Pulsar "Reproducir ahora" desde el menú contextual actúa como la interfaz web de Subsonic, reproduciendo todos los items a partir del seleccionado</string> <string name="settings.large_album_art">Carátulas grandes</string> <string name="settings.large_album_art_summary">Mostrar los discos con carátulas grandes en vez de en lista</string> <string name="settings.admin_enabled">Admin Habilitado</string> @@ -420,14 +404,6 @@ <string name="settings.open_to_tab">Abrir en pestaña</string> <string name="settings.open_to_tab_summary">Abrir directamente a esta pestaña</string> - <string name="share.info">Dueño: %1$s - \nDescripción: %2$s - \nURL: %3$s - \nCreado: %4$s - \nÚltima visita: %5$s - \nExpira: %6$s - \nNúmero de visitas: %7$s - </string> <string name="share.expires">Expira: %s</string> <string name="share.expires_never">Nunca expira</string> <string name="share.deleted">Compartición eliminada %s</string> @@ -490,9 +466,7 @@ <string name="music_service.retry">Error de red. Reintentando %1$d de %2$d.</string> - <string name="background_task.wait">Por favor, espere...</string> - <string name="background_task.loading">Cargando.</string> - <string name="background_task.no_network">Este programa requiere de acceso a la red. Encienda el Wi-Fi o la conexión de datos móviles.</string> + <string name="background_task.no_network">Este programa requiere de acceso a la red. Encienda el Wi-Fi o la conexión de datos móviles.</string> <string name="background_task.network_error">Error de red. Por favor, compruebe la dirección del servidor o inténtelo más tarde.</string> <string name="background_task.not_found">Recurso no encontrado. Por favor, compruebe la dirección del servidor.</string> <string name="background_task.parse_error">Respuesta desconocida. Por favor, compruebe la dirección del servidor.</string> @@ -506,8 +480,7 @@ <string name="parser.artist_count">Recibidos %d artistas.</string> <string name="parser.scan_count">Escaneados %d entradas</string> - <string name="select_artist.refresh">Actualizar</string> - <string name="select_artist.folder">Seleccionar carpeta</string> + <string name="select_artist.folder">Seleccionar carpeta</string> <string name="select_artist.all_folders">Todas las carpetas</string> <string name="equalizer.bass_booster">Potenciar bajos</string> @@ -537,9 +510,7 @@ <string name="changelog_ok_button">OK</string> <string name="changelog_show_full">Más…</string> - <string name="chat.send_a_message">Enviar un mensaje</string> - - <string name="changelog_version_format" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">Version <xliff:g id="version_name">%s</xliff:g></string> + <string name="chat.send_a_message">Enviar un mensaje</string> <string name="tasker.start_playing">Comenzar reproduciendo</string> <string name="tasker.start_playing_title">Tasker -> Encender DSub</string> diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 4674ca32..f384060a 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -7,10 +7,10 @@ <string name="common.cancel">Annuler</string> <string name="common.play_now">Jouer</string> <string name="common.play_shuffled">Jouer au hasard</string> - <string name="common.play_next">Suivant</string> - <string name="common.play_last">Précédent</string> + <string name="common.play_next">Jouer juste après</string> + <string name="common.play_last">Jouer en fin de liste</string> <string name="common.download">Mettre en cache</string> - <string name="common.pin">Mettre en cache Permanent</string> + <string name="common.pin">Mettre en cache permanent</string> <string name="common.delete">Supprimer</string> <string name="common.star">Favori</string> <string name="common.unstar">Supp. favori</string> @@ -19,20 +19,19 @@ <string name="common.comment">Commentaire</string> <string name="common.public">Publique</string> <string name="common.play_external">Jouer Video</string> - <string name="common.stream_external">Stream Video</string> + <string name="common.stream_external">Stream Vidéo</string> <string name="common.confirm">Confirmer</string> <string name="common.confirm_message">Voulez-vous %1$s %2$s ?</string> <string name="common.confirm_message_cache">cache</string> - <string name="common.empty">Aucune donnée</string> + <string name="common.empty">Aucune données</string> <string name="common.warning">Avertissement</string> <string name="button_bar.home">Accueil</string> <string name="button_bar.browse">Bibliothèque</string> - <string name="button_bar.search">Recherche</string> - <string name="button_bar.playlists">Playlists</string> + <string name="button_bar.playlists">Playlists</string> <string name="button_bar.now_playing">Lecture en cours</string> <string name="button_bar.podcasts">Podcasts</string> - <string name="button_bar.bookmarks">Favoris</string> + <string name="button_bar.bookmarks">Signets</string> <string name="button_bar.shares">Partages</string> <string name="button_bar.chat">Chat</string> <string name="button_bar.admin">Admin</string> @@ -40,7 +39,7 @@ <string name="main.welcome_title">Bienvenue !</string> <string name="main.welcome_text">Bienvenue dans DSub ! L\'application est actuellement configurée pour se connecter au serveur de démo Subsonic (<b>demo.subsonic.org</b>). Vous pouvez configurer votre propre serveur dans les paramètres. Choisir <b>Paramètres</b> et mettre à jour la configuration pour vous y connecter.</string> - <string name="main.about_title">A propos de DSub</string> + <string name="main.about_title">À propos de DSub</string> <string name="main.faq_title">FAQ</string> <string name="main.faq_text"> <![CDATA[ @@ -50,14 +49,13 @@ <br/>Assurez-vous de ne pas utiliser un certificat auto-signé, Chromecast les rejette systématiquement. ]]> </string> - <string name="main.select_server">Choisir un serveur</string> - <string name="main.shuffle">Jouer au hasard</string> + <string name="main.shuffle">Jouer au hasard</string> <string name="main.offline">Déconnecter</string> <string name="main.online">Connecter</string> <string name="main.settings">Paramètres</string> <string name="main.albums_title">Albums</string> <string name="main.albums_newest">Ajoutés récemments</string> - <string name="main.albums_recent">Joués récemment</string> + <string name="main.albums_recent">Joués récemments</string> <string name="main.albums_frequent">Les plus joués</string> <string name="main.albums_highest">Les mieux notés</string> <string name="main.albums_starred">Favoris</string> @@ -66,7 +64,7 @@ <string name="main.albums_year">Par décennies</string> <string name="main.songs_genres">@string/main.albums_genres</string> <string name="main.back_confirm">Presser retour à nouveau pour quitter</string> - <string name="main.scan_complete">Completed scan of Server</string> + <string name="main.scan_complete">Analyse du server terminée</string> <string name="menu.search">Recherche</string> <string name="menu.shuffle">Hasard</string> @@ -77,31 +75,31 @@ <string name="menu.settings">Paramètres</string> <string name="menu.help">Aide</string> - <string name="menu.about">A propos</string> + <string name="menu.about">À propos</string> <string name="menu.add_playlist">Ajouter à la playlist</string> <string name="menu.remove_playlist">Supprimer de la playlist</string> <string name="menu.deleted_playlist">Supprimer la playlist %s</string> - <string name="menu.deleted_playlist_error">Echec de la suppression de la playlist %s</string> + <string name="menu.deleted_playlist_error">Échec de la suppression de la playlist %s</string> <string name="menu.log">Envoyer le journal</string> <string name="menu.set_timer">Ajuster le minuteur</string> <string name="menu.check_podcasts">Vérifier les nouveaux podcasts</string> <string name="menu.add_podcast">Ajouter une chaîne</string> <string name="menu.keep_synced">Synchronisation automatique</string> <string name="menu.stop_sync">Arrêter la synchro.</string> - <string name="menu.show_all">Afficher tous les media</string> + <string name="menu.show_all">Afficher tous les médias</string> <string name="menu.show_artist">Afficher l\'artiste</string> <string name="menu.share">Partager</string> <string name="menu.delete_cache">Supprimer du cache</string> <string name="menu.cast">Diffuser vers appareil</string> <string name="menu.faq">FAQ</string> - <string name="menu.add_user">Ajouter utilisateur</string> - <string name="menu.rescan">Relire le server</string> + <string name="menu.add_user">Ajouter un utilisateur</string> + <string name="menu.rescan">Relire le serveur</string> <string name="menu.rate">Noter</string> <string name="playlist.label">Playlists</string> - <string name="playlist.update_info">Mise à jour informations</string> + <string name="playlist.update_info">Mise à jour des informations</string> <string name="playlist.updated_info">Informations de la playlist %s mises à jour</string> - <string name="playlist.updated_info_error">Echec de la mise à jour des informations de la playlist %s</string> + <string name="playlist.updated_info_error">Échec de la mise à jour des informations de la playlist %s</string> <string name="playlist.overwrite">Remplacer la playlist existante</string> <string name="playlist.add_to">Ajouter à la playlist</string> <string name="playlist.create_new">Créer une nouvelle</string> @@ -114,21 +112,14 @@ <string name="search.artists">Artistes</string> <string name="search.albums">Albums</string> <string name="search.songs">Chansons</string> - <string name="search.more">Afficher plus</string> - <string name="progress.wait">Patientez…</string> + <string name="progress.wait">Patientez…</string> - <string name="music_library.label">Bibliothèque</string> - <string name="music_library.label_offline">Média mode déconnecté</string> - - <string name="select_album.select">Tout sélectionner</string> - <string name="select_album.n_selected">%d pistes sélectionnées.</string> - <string name="select_album.more">Plus</string> - <string name="select_album.offline">Déconnecté</string> - <string name="select_album.searching">Recherche en cours...</string> - <string name="select_album.no_sdcard">Erreur : Aucune carte SD card disponible.</string> + <string name="select_album.n_selected">%d pistes sélectionnées.</string> + <string name="select_album.offline">Déconnecté</string> + <string name="select_album.no_sdcard">Erreur : Aucune carte SD card disponible.</string> <string name="select_album.no_network">Problème : Aucun réseau disponible.</string> - <string name="select_album.not_licensed">Serveur sans licence valide. %d jours restant.</string> + <string name="select_album.not_licensed">Serveur sans licence valide. %d jours restants.</string> <string name="select_album.donate_dialog_message">Téléchargement illimité en supportant Subsonic.</string> <string name="select_album.donate_dialog_now">Maintenant</string> <string name="select_album.donate_dialog_later">Plus tard</string> @@ -147,19 +138,19 @@ <string name="select_genre.songs">%d chansons</string> <string name="select_genre.albums">%d albums</string> - <string name="select_podcasts.error">Une erreur est survenue avec ce podcast pendant le chargement. Le serveur doit d\'abord le télécharger.</string> - <string name="select_podcasts.skipped">Ce podcast n\'a pas été chargé sur le serveur. Le serveur doit d\'abord le télécharger.</string> - <string name="select_podcasts.initializing">Le chargement du podcast a commencer sur le serveur. Recharger SVP dans quelques instants.</string> + <string name="select_podcasts.error">Une erreur est survenue avec ce podcast pendant le chargement. Le serveur doit d\'abord le télécharger.</string> + <string name="select_podcasts.skipped">Ce podcast n\'a pas été chargé sur le serveur. Le serveur doit d\'abord le télécharger.</string> + <string name="select_podcasts.initializing">Le chargement du podcast a commencé sur le serveur. Recharger SVP dans quelques instants.</string> <string name="select_podcasts.server_download">Télécharger sur le serveur</string> <string name="select_podcasts.server_delete">Supprimer du serveur</string> <string name="select_podcasts.downloading">Téléchargement %s sur le serveur</string> - <string name="select_podcasts.refreshing">Le serveur recherche les mises à jour de podcasts</string> + <string name="select_podcasts.refreshing">Le serveur recherche les mises à jour des podcasts</string> <string name="select_podcasts.deleted">Podcast supprimé %s</string> <string name="select_podcasts.deleted_error">Erreur lors de la suppression du podcast %s</string> <string name="select_podcasts.add_url">URL :</string> <string name="select_podcasts.created_error">Erreur lors de l\'ajout du podcast</string> <string name="select_podcasts.invalid_podcast_channel">Podcast invalide : %s</string> - <string name="select_podcasts.delete">Supprimer podcast</string> + <string name="select_podcasts.delete">Supprimer le podcast</string> <string name="download.empty">La playlist est vide</string> <string name="download.shuffle_loading">Chargement en cours liste au hasard...</string> @@ -169,7 +160,7 @@ <string name="download.menu_show_album">Afficher l\'album</string> <string name="download.menu_lyrics">Paroles</string> <string name="download.menu_remove_all">Enlever tout</string> - <string name="download.menu_screen_on">Ecran actif</string> + <string name="download.menu_screen_on">Écran actif</string> <string name="download.menu_shuffle">Hasard</string> <string name="download.menu_toggle">Basculer</string> <string name="download.menu_save">Enregistrer la playlist</string> @@ -183,13 +174,9 @@ <string name="download.repeat_off">Répéter inactif</string> <string name="download.repeat_all">Répéter tout</string> <string name="download.repeat_single">Répéter titre</string> - <string name="download.jukebox_on">Télécommande activée. La musique est diffusée sur l\'ordinateur.</string> - <string name="download.jukebox_off">Télécommande désactivée. La musique est diffusée sur le mobile.</string> - <string name="download.jukebox_volume">Volume distant</string> - <string name="download.jukebox_server_too_old">Télécommande non supportée. Mettre à jour le serveur Subsonic.</string> + <string name="download.jukebox_server_too_old">Télécommande non supportée. Mettre à jour le serveur Subsonic.</string> <string name="download.jukebox_offline">La télécommande n\'est pas disponible en mode déconnecté.</string> <string name="download.jukebox_not_authorized">Mode télécommande non autorisée. Activer le mode jukebox.<b>Users > Settings</b> on your Subsonic server.</string> - <string name="download.timer_length">Minuteur :</string> <string name="download.start_timer">Démarrer le minuteur</string> <string name="download.need_download">La vidéo doit d\'abord être téléchargée</string> <string name="download.no_streaming_player">Aucun lecteur ne peut afficher ce flux</string> @@ -200,8 +187,8 @@ <string name="download.downloading_summary">En cours : %1$s</string> <string name="download.downloading_summary_expanded">En cours : %1$s \nTaille estimée : %2$s</string> - <string name="download.failed_to_load">Echec du chargement</string> - <string name="download.save_bookmark_failed">Echec de la création du favori</string> + <string name="download.failed_to_load">Échec du chargement</string> + <string name="download.save_bookmark_failed">Échec de la création du favori</string> <string name="sync.new_podcasts">Nouveaux podcasts disponibles</string> <string name="sync.new_playlists">Nouveaux titres dans les playlists</string> @@ -210,18 +197,18 @@ <string name="starring_content_starred">Noté \"%s\"</string> <string name="starring_content_unstarred">Dévalués \"%s\"</string> - <string name="starring_content_error">Echec de la mise à jour \"%s\", Réessayer plus tard.</string> + <string name="starring_content_error">Échec de la mise à jour \"%s\", réessayer plus tard.</string> - <string name="playlist_error">Echec de la récupération des playlists</string> + <string name="playlist_error">Échec de la récupération des playlists</string> <string name="updated_playlist">Titre %1$s ajouté à \"%2$s\"</string> - <string name="updated_playlist_error">Echec de la mise à jour \"%s\", réessayer plus tard.</string> + <string name="updated_playlist_error">Échec de la mise à jour \"%s\", réessayer plus tard.</string> <string name="removed_playlist">Titre %1$s retiré de \"%2$s\"</string> - <string name="bookmark.delete">Supprimer le favori</string> - <string name="bookmark.delete_title">Dupprimer le favori pour</string> - <string name="bookmark.deleted">Favori pour \"%s\" supprimé</string> - <string name="bookmark.deleted_error">Echec de la suppression du favori pour \"%s\"</string> - <string name="bookmark.details_title">Détails du favori</string> + <string name="bookmark.delete">Supprimer le signet</string> + <string name="bookmark.delete_title">Supprimer le signet pour</string> + <string name="bookmark.deleted">Signet pour \"%s\" supprimé</string> + <string name="bookmark.deleted_error">Échec de la suppression du signet pour \"%s\"</string> + <string name="bookmark.details_title">Détails du signet</string> <string name="bookmark.details">Titre : %1$s \nPosition : %2$s \nCréé le : %3$s @@ -230,13 +217,13 @@ <string name="bookmark.resume_title">Reprendre la lecture ?</string> <string name="bookmark.resume">Reprendre la lecture de \'%1$s\' depuis %2$s</string> <string name="bookmark.action_resume">Reprendre</string> - <string name="bookmark.action_start_over">Start Over</string> + <string name="bookmark.action_start_over">Relire depuis le début</string> <string name="rating.title">Noter \"%s\"</string> <string name="rating.set_rating">Note attribuée à \"%s\"</string> <string name="rating.set_rating_failed">Echec de l\'attribution de la note à \"%s\"</string> <string name="rating.remove_rating">Note supprimée pour \"%s\"</string> - <string name="rating.remove_rating_failed">Echec de la suppression de la note pour \"%s\"</string> + <string name="rating.remove_rating_failed">Échec de la suppression de la note pour \"%s\"</string> <string name="song_details.error">Erreur</string> <string name="song_details.skipped">Ignoré</string> @@ -277,9 +264,9 @@ <string name="settings.invalid_username">Saisir un nom d\'utilisateur valide (espaces interdits).</string> <string name="settings.appearance_title">Apparence</string> <string name="settings.theme_title">Thème</string> - <string name="settings.theme_light">Light</string> - <string name="settings.theme_dark">Dark</string> - <string name="settings.theme_black">Black</string> + <string name="settings.theme_light">Clair</string> + <string name="settings.theme_dark">Sombre</string> + <string name="settings.theme_black">Noir</string> <string name="settings.theme_holo">Holo</string> <string name="settings.theme_fullscreen">Plein écran</string> <string name="settings.theme_fullscreen_summary">Cacher autant d\'élément graphique que possible</string> @@ -313,8 +300,8 @@ <string name="settings.max_video_bitrate_3000">3000 Kbps</string> <string name="settings.max_video_bitrate_5000">5000 Kbps</string> <string name="settings.max_bitrate_unlimited">Illimité</string> - <string name="settings.wifi_required_title">Streaming en Wifi uniquement</string> - <string name="settings.wifi_required_summary">Ne lire les média qu\'avec une connexion Wifi</string> + <string name="settings.wifi_required_title">Streaming en wifi uniquement</string> + <string name="settings.wifi_required_summary">Ne lire les média qu\'avec une connexion wifi</string> <string name="settings.network_timeout_title">Délai d\'attente réseau (timeout)</string> <string name="settings.network_timeout_10000">10 secondes</string> <string name="settings.network_timeout_15000">15 secondes</string> @@ -344,7 +331,7 @@ <string name="settings.playlist_random_size_title">Taille de la liste de lecture aléatoire</string> <string name="settings.sleep_timer_title">Temporisateur</string> <string name="settings.sleep_timer_duration_title">Durée temporisation</string> - <string name="settings.sleep_timer_off">Eteindre</string> + <string name="settings.sleep_timer_off">Éteindre</string> <string name="settings.sleep_timer_on">Allumer</string> <string name="settings.sleep_timer_always_on">Toujours en fonctionnement</string> <string name="settings.temp_loss_title">Perte temporaire de focus</string> @@ -374,8 +361,8 @@ <string name="settings.hide_widget_summary">Cacher le widget après avoir quitté l\'application</string> <string name="settings.podcasts_enabled">Podcasts autorisés</string> <string name="settings.podcasts_enabled_summary">Afficher ou non l\'accès aux podcasts</string> - <string name="settings.bookmarks_enabled">Favoris autorisés</string> - <string name="settings.bookmarks_enabled_summary">Afficher ou non l\'accès aux favoris</string> + <string name="settings.bookmarks_enabled">Signets autorisés</string> + <string name="settings.bookmarks_enabled_summary">Afficher ou non l\'accès aux signets</string> <string name="settings.shares_enabled">Partages autorisés</string> <string name="settings.shares_enabled_summary">Afficher ou non l\'accès aux partages</string> <string name="settings.sync_title">Sync</string> @@ -411,36 +398,25 @@ <string name="settings.override_system_language">Ne pas utiliser la langue du système</string> <string name="settings.override_system_language_summary">Afficher DSub en Anglais même si une traduction existe pour la langue système. Peut nécessiter un vidage du cache de l\'application.</string> <string name="settings.drawer_items_title">Entrées de menu</string> - <string name="settings.play_now_after">Jouer maintenant - Plus tard</string> - <string name="settings.play_now_after_summary">Play Now context menu for a song plays everything after selected item (like the Subsonic web GUI)</string> <string name="settings.large_album_art">Pochettes larges</string> <string name="settings.large_album_art_summary">Afficher les pochettes en grand plutôt qu\'en liste.</string> <string name="settings.admin_enabled">Administration</string> <string name="settings.admin_enabled_summary">Afficher ou non l\'accès aux outils d\'administration</string> - <string name="shuffle.title">Shuffle By</string> + <string name="shuffle.title">Mélanger par</string> <string name="shuffle.startYear">Année début :</string> <string name="shuffle.endYear">Année fin :</string> <string name="shuffle.genre">Genre :</string> <string name="shuffle.pick_genre">Choisir un genre</string> - <string name="share.info">Propriétaire : %1$s - \nDescription: %2$s - \nURL: %3$s - \nCréation : %4$s - \nDernière visite : %5$s - \nExpiration : %6$s - \nNombre de visites : %7$s - - </string> <string name="share.expires">Expiration : %s</string> <string name="share.expires_never">N\'expire jamais</string> <string name="share.deleted">Supprimer le partage %s</string> - <string name="share.deleted_error">Echec de la suppression du partage %s</string> + <string name="share.deleted_error">Échec de la suppression du partage %s</string> <string name="share.no_expiration">Pas d\'expiration</string> <string name="share.expiration">Expiration :</string> <string name="share.updated_info">Informations de partage mises à jour pour %s</string> - <string name="share.updated_info_error">Echec de la mise à jour des informations de partage pour %s</string> + <string name="share.updated_info_error">Échec de la mise à jour des informations de partage pour %s</string> <string name="share.via">Partager via</string> <string name="share.delete">Supprimer le partage</string> @@ -452,20 +428,20 @@ <string name="admin.change_username_invalid">Saisir un nom d\'utilisateur valide</string> <string name="admin.update_permissions">Mettre à jour les autorisations</string> <string name="admin.update_permissions_success">Autorisation mises à jour pour %1$s</string> - <string name="admin.update_permissions_error">Echec lors de lamise à jour des autorisations de %1$s</string> - <string name="admin.change_email">Modifier Email</string> + <string name="admin.update_permissions_error">Échec lors de la mise à jour des autorisations de %1$s</string> + <string name="admin.change_email">Modifier l\'email</string> <string name="admin.change_email_success">Email remplacé pour %1$s</string> - <string name="admin.change_email_error">Echec lors du remplacement de l\'Email de %1$s</string> - <string name="admin.change_email_label">Nouvel Email :</string> - <string name="admin.change_email_invalid">Saisir un Email valide</string> + <string name="admin.change_email_error">Échec lors du remplacement de l\'email de %1$s</string> + <string name="admin.change_email_label">Nouvel email :</string> + <string name="admin.change_email_invalid">Saisir un email valide</string> <string name="admin.change_password">Modifier le mot de passe</string> <string name="admin.change_password_success">Mot de passe modifié pour %1$s</string> - <string name="admin.change_password_error">Echec du remplacement du mot de passe pour %1$s</string> + <string name="admin.change_password_error">Échec du remplacement du mot de passe pour %1$s</string> <string name="admin.change_password_label">Nouveau mot de passe :</string> <string name="admin.change_password_invalid">Saisir un mot de passe valide</string> <string name="admin.delete_user">Supprimer l\'utilisateur</string> <string name="admin.delete_user_success">Suppression effectuée %1$s</string> - <string name="admin.delete_user_error">Echec de la suppression %1$s</string> + <string name="admin.delete_user_error">Échec de la suppression %1$s</string> <string name="admin.confirm_password">Confirmer le mot de passe</string> <string name="admin.confirm_password_bad">Mot de passe saisi erroné</string> @@ -477,37 +453,34 @@ <string name="admin.role.coverArt">Modifier les pochettes</string> <string name="admin.role.comment">Ajouter des commentaires</string> <string name="admin.role.podcast">Gérer les podcasts</string> - <string name="admin.role.stream">Ecouter de la musique</string> + <string name="admin.role.stream">Écouter de la musique</string> <string name="admin.role.jukebox">Télécommander la lecture (jukebox)</string> <string name="admin.role.share">Gérer les partages</string> <string name="admin.role.lastfm">Utiliser Last.FM</string> <string name="music_service.retry">Erreur réseau. Nouvelle tentative %1$d de %2$d.</string> - <string name="background_task.wait">Patienter...</string> - <string name="background_task.loading">Chargement.</string> - <string name="background_task.no_network">Cette application nécessite un accès réseau. Activer les connexion Wifi ou mobile.</string> + <string name="background_task.no_network">Cette application nécessite un accès réseau. Activer les connexion Wifi ou mobile.</string> <string name="background_task.network_error">Une erreur réseau est survenue. Merci de vérifier l\'adresse du serveur ou réessayer plus tard.</string> <string name="background_task.not_found">Ressource non trouvée. Vérifier l\'adresse du serveur.</string> <string name="background_task.parse_error">Erreur de communication avec le serveur.Vérifier l\'adresse du serveur et que la connexion via un navigateur fonctionne.</string> <string name="service.connecting">Interrogation du serveur, veuillez patienter.</string> - <string name="parser.upgrade_client"> Versions incompatible. Mettre à jour DSub.</string> - <string name="parser.upgrade_server">Versions incompatibles. Mettre à jour le serveur Subsonic.</string> + <string name="parser.upgrade_client">Version incompatible. Mettre à jour DSub.</string> + <string name="parser.upgrade_server">Version incompatible. Mettre à jour le serveur Subsonic.</string> <string name="parser.not_authenticated">Mauvais nom d\'utilisateur ou mot de passe.</string> <string name="parser.not_authorized">Non autorisé. Vérifier les droit de l\'utilisateur sur le serveur Subsonic.</string> <string name="parser.artist_count">%d artistes récupérés.</string> <string name="parser.server_error">Erreur serveur : %s</string> <string name="parser.scan_count">%d entrées trouvées</string> - <string name="select_artist.refresh">Recharger</string> - <string name="select_artist.folder">Sélectionner un dossier</string> - <string name="select_artist.all_folders">Tous les dossier</string> + <string name="select_artist.folder">Sélectionner un dossier</string> + <string name="select_artist.all_folders">Tous les dossiers</string> - <string name="equalizer.label">Equaliseur</string> + <string name="equalizer.label">Équaliseur</string> <string name="equalizer.enabled">Activé</string> - <string name="equalizer.preset">Selectioner un préréglage</string> + <string name="equalizer.preset">Sélectionner un préréglage</string> <string name="equalizer.bass_booster">Bass Booster</string> <string name="equalizer.voice_booster">Voice Booster</string> <string name="equalizer.db_size">%d dB</string> @@ -526,14 +499,12 @@ <string name="util.bytes_format.kilobyte">0 KB</string> <string name="util.bytes_format.byte">0 B</string> - <string name="changelog_full_title">Change Log</string> - <string name="changelog_title">What\'s New</string> + <string name="changelog_full_title">Liste des changements</string> + <string name="changelog_title">Nouveautés</string> <string name="changelog_ok_button">OK</string> <string name="changelog_show_full">Plus…</string> - <string name="chat.send_a_message">Envoyer un message</string> - - <string name="changelog_version_format" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">Version <xliff:g id="version_name">%s</xliff:g></string> + <string name="chat.send_a_message">Envoyer un message</string> <string name="tasker.start_playing">Commencer la lecture</string> <string name="tasker.start_playing_title">Tasker -> Démarrer DSub</string> diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 60b127be..12102043 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -32,11 +32,11 @@ <string name="button_bar.home">Főoldal</string> <string name="button_bar.browse">Médiatár</string> - <string name="button_bar.search">Keresés</string> - <string name="button_bar.playlists">Lejátszási listák</string> + <string name="button_bar.playlists">Lejátszási listák</string> <string name="button_bar.now_playing">Várólista</string> <string name="button_bar.podcasts">Podcastok</string> <string name="button_bar.bookmarks">Könyvjelzők</string> + <string name="button_bar.internet_radio">Internet rádió</string> <string name="button_bar.shares">Megosztások</string> <string name="button_bar.chat">Csevegés (Chat)</string> <string name="button_bar.admin">Admin</string> @@ -54,12 +54,11 @@ <br/>Míg a normál módon gyorsítótárazott dalok törlődhetnek amikor újak kerülnek letöltésre, addig a \"Letöltés tárolásra (megőrzés)\" menüpont segítségével letöltött dalok soha nem törlődnek automatikusan. <p/><font color="red">Ha a ChromeCast sikertelen</font>: <br/>Próbálja meg bejelölni: Beállítások -> Lejátszás -> Eszköz használata proxyként. Ez egy kerülő megoldás arra, ha a ChromeCast elutasítja a saját aláírású tanúsítványt. - <p/><font color="red">A Médiatár első szintje tulajdonképpen az előadók csoportja</font>: - <br/>A Beállítások menüben törölje az "Előadók első szintje" jelölést. Ez teszi lehetővé, hogy a mappák teljes első szintjének megjelenítése előadói csoportonként és ne előadónként legyen kezelve. + <p/><font color="red">A Médiatár első szintje ugyanolyan, mint az előadók listája</font>: + <br/>Ha a Beállítások menüben kikapcsolja az "Részletes megjelenítés" opciót, akkor a mappák teljes első szintje ugyanúgy lesz megjelenítve, mint az előadók listája. ]]> </string> - <string name="main.select_server">Kiszolgáló kiválasztása</string> - <string name="main.shuffle">Lejátszás kevert sorrendben</string> + <string name="main.shuffle">Lejátszás kevert sorrendben</string> <string name="main.offline">Offline mód</string> <string name="main.online">Online mód</string> <string name="main.settings">Beállítások</string> @@ -76,6 +75,10 @@ <string name="main.albums_alphabetical">Betűrendben</string> <string name="main.videos">Videók</string> <string name="main.songs_genres">@string/main.albums_genres</string> + <string name="main.songs_newest">@string/main.albums_newest</string> + <string name="main.songs_top_played">Top Played</string> + <string name="main.songs_recent">@string/main.albums_recent</string> + <string name="main.songs_frequent">@string/main.albums_frequent</string> <string name="main.back_confirm">Nyomja meg még egyszer a kilépéshez!</string> <string name="main.scan_complete">A médiatár frissítése befejeződött a kiszolgálón!</string> <string name="main.artist">Előadó</string> @@ -113,7 +116,7 @@ <string name="menu.similar_artists">Hasonló előadók</string> <string name="menu.show_missing">Hiányzó megjelenítése</string> <string name="menu.start_radio">Rádió indítása</string> - <string name="menu.first_level_artist">Előadók első szintje</string> + <string name="menu.first_level_artist">Részletes megjelenítés</string> <string name="playlist.label">Lejátszási listák</string> <string name="playlist.update_info">Szerkesztés</string> @@ -131,20 +134,13 @@ <string name="search.artists">Előadók</string> <string name="search.albums">Albumok</string> <string name="search.songs">Dalok</string> - <string name="search.more">Továbbiak</string> - <string name="progress.wait">Kérem várjon...</string> + <string name="progress.wait">Kérem várjon...</string> <string name="progress.artist_info">Az előadó életrajzának betöltése...</string> - <string name="music_library.label">Médiatár</string> - <string name="music_library.label_offline">Kapcsolat nélküli médiák</string> - - <string name="select_album.select">Összes jelölése be/ki</string> - <string name="select_album.n_selected">%d kijelölve.</string> - <string name="select_album.more">Továbbiak</string> - <string name="select_album.offline">Offline</string> - <string name="select_album.searching">Keresés...</string> - <string name="select_album.no_sdcard">Hiba: SD kártya nem áll rendelkezésre!</string> + <string name="select_album.n_selected">%d kijelölve.</string> + <string name="select_album.offline">Offline</string> + <string name="select_album.no_sdcard">Hiba: SD kártya nem áll rendelkezésre!</string> <string name="select_album.no_network">Figyelem: Hálózat nem áll rendelkezésre!</string> <string name="select_album.no_room">Figyelem: Már csak %s hely áll rendelkezésre!</string> <string name="select_album.not_licensed">A kiszolgálónak nincs licence! %d próbanap van hátra!</string> @@ -187,6 +183,7 @@ <string name="download.playerstate_mobile_disabled">Letöltés, várakozás a Wi-Fi hálózatra...</string> <string name="download.playerstate_buffering">Pufferelés</string> <string name="download.playerstate_playing_shuffle">Dalsorrend keverése</string> + <string name="download.playerstate_playing_artist_radio">Előadó rádió</string> <string name="download.menu_show_album">Ugrás az albumhoz</string> <string name="download.menu_lyrics">Dalszöveg</string> <string name="download.menu_remove_all">Összes eltávolítása</string> @@ -204,13 +201,9 @@ <string name="download.repeat_off">Ismétlés ki</string> <string name="download.repeat_all">Összes ismétlése</string> <string name="download.repeat_single">Dal ismétlése</string> - <string name="download.jukebox_on">Távvezérlés bekapcsolása. A zenelejátszás a számítógépen történik.</string> - <string name="download.jukebox_off">Távvezérlés kikapcsolása. A zenelejátszás az eszközön történik.</string> - <string name="download.jukebox_volume">Hangerő távvezérlése</string> - <string name="download.jukebox_server_too_old">A távvezérlés nem támogatott. Kérjük, frissítse a Subsonic kiszolgálót!</string> + <string name="download.jukebox_server_too_old">A távvezérlés nem támogatott. Kérjük, frissítse a Subsonic kiszolgálót!</string> <string name="download.jukebox_offline">A távvezérlés nem lehetséges offline módban!</string> <string name="download.jukebox_not_authorized">A távvezérlés nem lehetséges! Engedélyezze a Jukebox módot a <b>Users > Settings</b> menüben a Subsonic kiszolgálón!</string> - <string name="download.timer_length">Időhossz:</string> <string name="download.start_timer">Időzítő indítása</string> <string name="download.stop_timer">Időzítő megállítása</string> <string name="download.need_download">A videót először le kell tölteni!</string> @@ -227,6 +220,13 @@ <string name="download.restore_play_queue">Folytatás onnan, ahol egy másik eszközön abbahagyta.</string> <string name="download.thumbs_up">Jó</string> <string name="download.thumbs_down">Nem jó</string> + <string name="download.batch_mode">Kötegelt mód</string> + <string name="download.playback_speed_half">0.5x</string> + <string name="download.playback_speed_normal">1x</string> + <string name="download.playback_speed_one_half">1.5x</string> + <string name="download.playback_speed_double">2x</string> + <string name="download.playback_speed_tripple">3x</string> + <string name="download.playback_speed_custom">Egyéni</string> <string name="sync.new_podcasts">Új podcastok: \"%s\"</string> <string name="sync.new_playlists">Új lejátszási listák: \"%s\"</string> @@ -291,6 +291,8 @@ <string name="settings.cache_location">Gyorsítótár helye</string> <string name="settings.cache_location_error">Hibás gyorsítótár hely! Az alapértelmezett használata.</string> <string name="settings.cache_location_reset">A beállított gyorsítótár-hely már nem írható! Ha a közelmúltban frissítette telefonja Android rendszerét 4.4.x KitKat verzióra, abban az SD kártya kezelése megváltozott, és az alkalmazások csak egy speciális helyre tudnak írni. A Dsub már automatikusan átállt a megfelelő helyre. Ahhoz, hogy a régi adatokat törölni tudja, csatlakoztassa az SD kártyát a számítógépéhez, és törölje a régi mappát!</string> + <string name="settings.cache_location_internal">Belső</string> + <string name="settings.cache_location_external">Külső</string> <string name="settings.cache_clear">Gyorsítótár törlése</string> <string name="settings.cache_clear_complete">Gyorsítótár törlése kész.</string> <string name="settings.testing_connection">Kapcsolat tesztelése...</string> @@ -305,6 +307,8 @@ <string name="settings.theme_dark">Sötét</string> <string name="settings.theme_black">Fekete</string> <string name="settings.theme_holo">Holo</string> + <string name="settings.theme_day_night">Nappal/Éjszaka</string> + <string name="settings.theme_day_black_night">Nappal/Fekete éjszaka</string> <string name="settings.theme_fullscreen">Teljes képernyős</string> <string name="settings.theme_fullscreen_summary">Teljes képernyős üzemmód (értesítési sáv elrejtése).</string> <string name="settings.track_title">Dalsorszám megjelenítése</string> @@ -407,6 +411,8 @@ <string name="settings.podcasts_enabled_summary">Podcastok menüpont megjelenítése az elhúzható oldalsávon.</string> <string name="settings.bookmarks_enabled">Könyvjelzők engedélyezése</string> <string name="settings.bookmarks_enabled_summary">Könyvjelzők menüpont megjelenítése az elhúzható oldalsávon.</string> + <string name="settings.internet_radio_enabled">Internet rádió engedélyezése</string> + <string name="settings.internet_radio_enabled_summary">Internet rádió menüpont megjelenítése az elhúzható oldalsávon.</string> <string name="settings.shares_enabled">Megosztások engedélyezése</string> <string name="settings.shares_enabled_summary">Megosztások menüpont megjelenítése az elhúzható oldalsávon.</string> <string name="settings.sync_title">Szinkronizálás</string> @@ -447,8 +453,11 @@ <string name="settings.override_system_language">A rendszer nyelvének felülbírálása</string> <string name="settings.override_system_language_summary">A Dsub megjelenítése angol nyelven abban az esetben is, ha rendelkezik fordítással. Az alkalmazást törölni kell a memóriából, mert a beállítás csak újraindítás után lép érvénybe!</string> <string name="settings.drawer_items_title">Oldalsáv elemei</string> - <string name="settings.play_now_after">Lejátszás utána</string> - <string name="settings.play_now_after_summary">Egy helyi menü, amivel lehetővé válik minden dal lejátszása a kijelölt elem után (mint a Subsonic webes felületén)</string> + <string name="settings.song_press_action">Viselkedés dal megérintésekor</string> + <string name="settings.song_press_play_single">Dal lejátszása</string> + <string name="settings.song_press_play_all">A teljes album hozzáadása a várólistához</string> + <string name="settings.song_press_play_next">Dal sorba állítása következőnek</string> + <string name="settings.song_press_play_last">Dal sorba állítása utolsónak</string> <string name="settings.large_album_art">Nagyméretű albumborítók</string> <string name="settings.large_album_art_summary">Albumok megjelenítése rácsnézetben és nagyméretű albumborítóval a listanézet helyett.</string> <string name="settings.admin_enabled">Admin engedélyezése</string> @@ -461,7 +470,7 @@ <string name="settings.replay_gain_type.track">Dal értékeiből</string> <string name="settings.replay_gain_bump">Hangerő-kiegyenlítés előerősítése</string> <string name="settings.replay_gain_untagged">Dalok hangerő-kiegyenlítés nélkül</string> - <string name="settings.casting">Casting (Tartalmak átküldése)</string> + <string name="settings.casting">Casting (tartalmak átküldése)</string> <string name="settings.casting_proxy">Eszköz használata proxyként</string> <string name="settings.casting_proxy_summary">Streamelés az eszközön (mint egy proxyn) keresztül. Ez megoldást jelenthet néhány esetben, pl. saját aláírású tanúsítvány használatakor.</string> <string name="settings.rename_duplicates">Duplikált dalok átnevezése</string> @@ -473,6 +482,12 @@ <string name="settings.shuffle_by_album">Keverés albumok szerint</string> <string name="settings.shuffle_by_album.true">Dalsorrend keverése albumonként szétválasztva.</string> <string name="settings.shuffle_by_album.false">Dalsorrend keverése az összes dalt együtt kezelve.</string> + <string name="settings.casting_stream_original">Eredeti stream</string> + <string name="settings.casting_stream_original_summary">Az eredeti fájl streamelése, ha a Cast-kompatibilis eszköz támogatja a fájltípust.</string> + <string name="settings.heads_up_notification">Felugró értesítések (5.0+)</string> + <string name="settings.heads_up_notification_summary">Lejátszási értesítések megjelenítése felugró értesítésekként (Android Lollipop+).</string> + <string name="settings.casting_cache">Casting közbeni gyorsítótárazás</string> + <string name="settings.casting_cache_summary">Az éppen lejátszott dal gyorsítótárazása a tartalomátküldés (Casting) alatt.</string> <string name="shuffle.title">Dalsorrend keverése</string> <string name="shuffle.startYear">Kezdő év:</string> @@ -480,15 +495,6 @@ <string name="shuffle.genre">Műfaj:</string> <string name="shuffle.pick_genre">Műfaj kiválasztása</string> - <string name="share.info">Tulajdonos: %1$s - \nLeírás: %2$s - \nURL: %3$s - \nLétrehozva: %4$s - \nUtolsó látogatás: %5$s - \nLejárati idő: %6$s - \nLátogatások száma: %7$s - - </string> <string name="share.expires">Lejárati idő: %s</string> <string name="share.expires_never">Nincs lejárati idő</string> <string name="share.deleted">\"%s\" megosztás törölve</string> @@ -517,6 +523,7 @@ <string name="admin.change_password">Jelszó csere</string> <string name="admin.change_password_success">\"%1$s\" jelszavának módosítása kész.</string> <string name="admin.change_password_error">\"%1$s\" jelszavának módosítása sikertelen!</string> + <string name="admin.change_password_current_label">Jelenlegi jelszó:</string> <string name="admin.change_password_label">Új jelszó:</string> <string name="admin.change_password_invalid">Adjon meg egy érvényes jelszót!</string> <string name="admin.delete_user">Felhasználó törlése</string> @@ -524,6 +531,8 @@ <string name="admin.delete_user_error">\"%1$s\" felhasználó törlése sikertelen!</string> <string name="admin.confirm_password">Jelszó megerősítése</string> <string name="admin.confirm_password_bad">A beírt jelszó nem egyezik!</string> + <string name="admin.permissions">Engedélyek</string> + <string name="admin.musicFolders">Zenekönyvtárak</string> <string name="admin.scrobblingEnabled">Scrobbling használata</string> <string name="admin.role.admin">Adminisztrátor</string> @@ -536,13 +545,12 @@ <string name="admin.role.stream">Zene streamelése</string> <string name="admin.role.jukebox">Jukebox vezérlése</string> <string name="admin.role.share">Megosztások kezelése</string> - <string name="admin.role.lastfm">Last.fm funkció használata</string> + <string name="admin.role.video_conversion">Videók konvertálása</string> + <string name="admin.role.lastfm">Last.fm szolgáltatás használata</string> <string name="music_service.retry">Hálózati hiba történt! Újrapróbálkozás %1$d/%2$d.</string> - <string name="background_task.wait">Kérem várjon...</string> - <string name="background_task.loading">Betöltés...</string> - <string name="background_task.no_network">Az alkalmazás hálózati hozzáférést igényel. Kérjük, kapcsolja be a Wi-Fi-t vagy a mobilhálózatot!</string> + <string name="background_task.no_network">Az alkalmazás hálózati hozzáférést igényel. Kérjük, kapcsolja be a Wi-Fi-t vagy a mobilhálózatot!</string> <string name="background_task.network_error">Hálózati hiba történt! Kérjük, ellenőrizze a kiszolgáló címét, vagy próbálja később!</string> <string name="background_task.not_found">Az erőforrás nem található! Kérjük, ellenőrizze a kiszolgáló címét!</string> <string name="background_task.parse_error">Hiba történt a kiszolgálóval történő kommunikációban. Kérjük, ellenőrizze a kiszolgáló címét, és próbáljon meg web böngészővel kapcsolódni a kiszolgálóhoz!</string> @@ -557,15 +565,14 @@ <string name="parser.server_error">Kiszolgáló hiba: %s</string> <string name="parser.scan_count">%d tétel átvizsgálva.</string> - <string name="select_artist.refresh">Frissítés</string> - <string name="select_artist.folder">Mappa kiválasztása</string> + <string name="select_artist.folder">Mappa kiválasztása</string> <string name="select_artist.all_folders">Összes mappa</string> <string name="equalizer.label">Equalizer</string> <string name="equalizer.enabled">Engedélyezve</string> <string name="equalizer.preset">Profil kiválasztása</string> - <string name="equalizer.bass_booster">Basszus fokozás</string> - <string name="equalizer.voice_booster">Beszédhang fokozás</string> + <string name="equalizer.bass_booster">Basszus fokozása</string> + <string name="equalizer.voice_booster">Beszédhang fokozása</string> <string name="equalizer.db_size">%d dB</string> <string name="equalizer.bass_size">%d ezer</string> @@ -589,7 +596,7 @@ <string name="chat.send_a_message">Üzenet küldése</string> - <string name="changelog_version_format" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">Version <xliff:g id="version_name">%s</xliff:g></string> + <string name="changelog_version_format">Verzió %s</string> <string name="tasker.start_playing">Lejátszás indítása</string> <string name="tasker.start_playing_shuffled">Lejátszás indítása kevert sorrendben</string> @@ -635,13 +642,16 @@ <string name="details.version">Verzió</string> <string name="details.files_cached">Gyorsítótárazott fájlok</string> <string name="details.files_permanent">Megőrzött fájlok</string> - <string name="details.used_space">Felhasznált tároló</string> + <string name="details.used_space">Felhasznált tárhely</string> <string name="details.available_space">Rendelkezésre álló hely</string> <string name="details.of">%1$s/%2$s</string> <string name="details.song">Dal</string> <string name="details.position">Pozíció</string> <string name="details.updated">Frissítve</string> <string name="details.starred">Csillagozott</string> + <string name="details.last_played">Utoljára lejátszott</string> + <string name="details.expiration">Lejárati idő</string> + <string name="details.played_count">Lejátszások száma</string> <plurals name="select_album_n_songs"> <item quantity="zero">Nincsenek dalok</item> diff --git a/app/src/main/res/values-large/dimens.xml b/app/src/main/res/values-large/dimens.xml index dfe7ff84..faf88b3e 100644 --- a/app/src/main/res/values-large/dimens.xml +++ b/app/src/main/res/values-large/dimens.xml @@ -5,4 +5,7 @@ <dimen name="Button.Small">54dip</dimen> <dimen name="AlbumArt.Small">96dip</dimen> <dimen name="AlbumArt.Header">210dip</dimen> + <dimen name="FastScroller.LeftAlignedMargin">10dp</dimen> + <dimen name="FastScroller.NormalBarMargin">8dp</dimen> + <dimen name="FastScroller.RightMargin">8dp</dimen> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values-large/integers.xml b/app/src/main/res/values-large/integers.xml index 914ec84a..243d3fc1 100644 --- a/app/src/main/res/values-large/integers.xml +++ b/app/src/main/res/values-large/integers.xml @@ -2,4 +2,5 @@ <resources> <integer name="Grid.Columns">3</integer> <integer name="TextDescriptionLength">10</integer> + <integer name="Card.Elevation">4</integer> </resources>
\ 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 new file mode 100644 index 00000000..93ff1f1d --- /dev/null +++ b/app/src/main/res/values-nl/strings.xml @@ -0,0 +1,636 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="common.appname">DSub</string> + <string name="common.ok">OK</string> + <string name="common.save">Opslaan</string> + <string name="common.cancel">Annuleer</string> + <string name="common.play_now">Afspelen</string> + <string name="common.play_shuffled">Willekeurig afspelen</string> + <string name="common.play_next">Volgend afspelen</string> + <string name="common.play_last">Laatst afspelen</string> + <string name="common.download">Cache</string> + <string name="common.pin">Permanente Cache</string> + <string name="common.delete">Verwijder</string> + <string name="common.star">Ster</string> + <string name="common.unstar">Verwijder ster</string> + <string name="common.info">Details</string> + <string name="common.name">Naam</string> + <string name="common.comment">Opmerking</string> + <string name="common.public">Publiek</string> + <string name="common.play_external">Speel video</string> + <string name="common.stream_external">Stream video</string> + <string name="common.confirm">Bevestig</string> + <string name="common.confirm_message">Wil je %1$s %2$s?</string> + <string name="common.confirm_message_cache">cache</string> + <string name="common.empty">Geen data</string> + <string name="common.warning">Waarschuwing</string> + <string name="common.close">Sluiten</string> + <string name="common.false">Nee</string> + <string name="common.true">Ja</string> + <string name="common.never">Nooit</string> + + <string name="button_bar.home">Home</string> + <string name="button_bar.browse">Bibliotheek</string> + <string name="button_bar.playlists">Playlists</string> + <string name="button_bar.now_playing">Speelt nu</string> + <string name="button_bar.podcasts">Podcasts</string> + <string name="button_bar.bookmarks">Bladwijzers</string> + <string name="button_bar.shares">Shares</string> + <string name="button_bar.chat">Chatten</string> + <string name="button_bar.admin">Admin</string> + <string name="button_bar.downloading">Downloaden</string> + <string name="button_bar.offline">Offline</string> + + <string name="main.welcome_title">Welkom!</string> + <string name="main.welcome_text">Welkom bij DSub! De app is momenteel alleen geconfigureerd om de demo server te gebruiken. Nadat je eigen server geïnstalleerd hebt (beschikbaar bij <b>subsonic.org</b>), ga dan naar <b>Instellingen</b> en verander de configuratie zodat je ermee kunt verbinden.</string> + <string name="main.about_title">Over DSub</string> + <string name="main.faq_title">FAQ</string> + <string name="main.faq_text"> + <![CDATA[ + <font color="red">Cache versus Permanente Cache</font>: + <br/>Wanneer nummers zijn gedownload door DSub (cache), kunnen ze verwijderd worden om ruimte te maken voor nieuwe downloads. Permanente cache, daarentegen, wordt nooit automatisch verwijderd. + <p/><font color="red">ChromeCast faalt</font>: + <br/>Probeer de optie Instellingen -> Afspelen -> Gebruik apparaat proxy. Hiermee wordt het probleem van niet geaccepteerde \'self signed\' certificaten omzeild. + <p/><font color="red">Het eerste niveau in de bibliotheek zijn eigenlijk groepen artiesten.</font>: + <br/>In het optiemenu deselecteer "Eerste niveau artiesten". Dit zorgt ervoor dat het gehele eerste niveau directories wordt behandeld als een groep artisten ipv individuele artiesten. + ]]> + </string> + <string name="main.shuffle">Willekeurig afspelen</string> + <string name="main.offline">Ga offline</string> + <string name="main.online">Ga online</string> + <string name="main.settings">Instellingen</string> + <string name="main.albums_title">Album lijsten</string> + <string name="main.albums_per_folder">Per folder</string> + <string name="main.albums_newest">Recent toegevoegd</string> + <string name="main.albums_recent">Recent afgespeeld</string> + <string name="main.albums_frequent">Meest afgespeeld</string> + <string name="main.albums_highest">Hoogst beoordeeld</string> + <string name="main.albums_starred">Met ster</string> + <string name="main.albums_random">Willekeurig</string> + <string name="main.albums_genres">Genres</string> + <string name="main.albums_year">Decennia</string> + <string name="main.albums_alphabetical">Alfabetisch</string> + <string name="main.videos">Video\'s</string> + <string name="main.songs_genres">@string/main.albums_genres</string> + <string name="main.back_confirm">Druk nogmaals terug om te stoppen</string> + <string name="main.scan_complete">Server scan afgerond</string> + <string name="main.artist">Artiest</string> + <string name="main.title">Titel</string> + + <string name="menu.search">Zoek</string> + <string name="menu.shuffle">Willekeurig</string> + <string name="menu.refresh">Ververs</string> + <string name="menu.play">Speel af</string> + <string name="menu.play_last">Speel laatst</string> + <string name="menu.exit">Beëindigen</string> + <string name="menu.settings">Instellingen</string> + <string name="menu.help">Help</string> + <string name="menu.about">Over</string> + <string name="menu.add_playlist">Voeg toe aan playlist</string> + <string name="menu.remove_playlist">Verwijder van playlist</string> + <string name="menu.deleted_playlist">Verwijderde playlist %s</string> + <string name="menu.deleted_playlist_error">Playlist %s kon niet verwijderd worden</string> + <string name="menu.log">Stuur log</string> + <string name="menu.set_timer">Stel timer in</string> + <string name="menu.check_podcasts">Controleer op nieuwe afleveringen</string> + <string name="menu.add_podcast">Voeg kanaal toe</string> + <string name="menu.keep_synced">Gesynchroniseerd houden</string> + <string name="menu.stop_sync">Stop synchroniseren</string> + <string name="menu.show_all">Toon alle media</string> + <string name="menu.show_artist">Toon artist</string> + <string name="menu.share">Deel</string> + <string name="menu.delete_cache">Verwijder cache</string> + <string name="menu.cast">Cast naar apparaat</string> + <string name="menu.faq">FAQ</string> + <string name="menu.add_user">Gebruiker toevoegen</string> + <string name="menu.rescan">Server scannen</string> + <string name="menu.rate">Bepaal rating</string> + <string name="menu.top_tracks">Laatste .FM Top Nummers</string> + <string name="menu.similar_artists">Gelijke artiesten</string> + <string name="menu.start_radio">Start radio</string> + <string name="menu.first_level_artist">Eerste niveau artiesten</string> + + <string name="playlist.label">Speellijsten</string> + <string name="playlist.update_info">Update informatie</string> + <string name="playlist.updated_info">Update speellijst informatie voor %s</string> + <string name="playlist.updated_info_error">Niet gelust speellijst information for %s te updaten</string> + <string name="playlist.overwrite">Overschrijf bestaande playlist</string> + <string name="playlist.add_to">Voeg toe aan playlist</string> + <string name="playlist.create_new">Creëer nieuw</string> + <string name="playlist.delete">Verwijder playlist</string> + + <string name="search.label">Zoek</string> + <string name="search.title">Zoek</string> + <string name="search.search">Klik om te zoeken</string> + <string name="search.no_match">Geen overeenkomst, zoek nogmaals</string> + <string name="search.artists">Artiesten</string> + <string name="search.albums">Albums</string> + <string name="search.songs">Nummers</string> + + <string name="progress.wait">Moment aub...</string> + <string name="progress.artist_info">Laadt artiesten bio</string> + + <string name="select_album.n_selected">%d geselecteerd.</string> + <string name="select_album.offline">Offline</string> + <string name="select_album.no_sdcard">Fout: Geen SD kaart beschikbaar.</string> + <string name="select_album.no_network">Waarschuwing: Netwerk onbeschikbaar.</string> + <string name="select_album.no_room">Waarschuwing: je hebt nog maar %s over</string> + <string name="select_album.not_licensed">Server niet gelicenseerd. %d proefdagen over.</string> + <string name="select_album.donate_dialog_message">Verkrijg ongelimeteerde downloads door te doneren aan Subsonic.</string> + <string name="select_album.donate_dialog_now">Nu</string> + <string name="select_album.donate_dialog_later">Later</string> + <string name="select_album.donate_dialog_0_trial_days_left">Proeftijd is voorbij</string> + + <string name="offline.sync_dialog_title">Offline nummers om gesynchroniseerd te worden</string> + <string name="offline.sync_dialog_message">Verwerk %1$d offline scrobbles? + \nVerwerk %2$d offline sterren? + </string> + <string name="offline.sync_dialog_default">Gebruik actie als standaard</string> + <string name="offline.sync_success">Succesvol %1$d nummers gesynchroniseerd</string> + <string name="offline.sync_partial">Succesvol %1$d van %2$d nummers gesynchroniseerd</string> + <string name="offline.sync_error">Mislukt om nummers te synchroniseren</string> + + <string name="select_genre.blank">Leeg</string> + <string name="select_genre.songs">%d nummers</string> + <string name="select_genre.albums">%d albums</string> + + <string name="select_podcasts.error">Deze podcast had een foutmelding tijdens het downloaden naar de server. De server moet het eerst downloaden.</string> + <string name="select_podcasts.skipped">Deze podcast is niet op de server gedownload. De server moet het eerst downloaden.</string> + <string name="select_podcasts.initializing">Dit podcast kanaal wordt ge\ïnitieerd door de server. Over een enkel moment herladen.</string> + <string name="select_podcasts.server_download">Download op de server</string> + <string name="select_podcasts.server_delete">Verwijder van server</string> + <string name="select_podcasts.downloading">Wordt nu gedownload %s op de server</string> + <string name="select_podcasts.refreshing">De server controleert nu op nieuwe podcasts</string> + <string name="select_podcasts.deleted">Verwijderde podcast %s</string> + <string name="select_podcasts.deleted_error">Kon podcast %s niet verwijderen</string> + <string name="select_podcasts.add_url">URL:</string> + <string name="select_podcasts.created_error">Niet gelukt podcast toe te voegen</string> + <string name="select_podcasts.invalid_podcast_channel">Ongeldig podcast kanaal: %s</string> + <string name="select_podcasts.delete">Verwijder podcast</string> + <string name="select_podcasts.channels">Podcast kanalen</string> + + <string name="download.empty">Playlist is leeg</string> + <string name="download.shuffle_loading">Shuffle lijst wordt geladen...</string> + <string name="download.playerstate_downloading">Downloaden - %s</string> + <string name="download.playerstate_mobile_disabled">Wachten op WiFi network om te kunnen downloaden</string> + <string name="download.playerstate_buffering">Bufferen</string> + <string name="download.playerstate_playing_shuffle">Afspelen shuffle</string> + <string name="download.menu_show_album">Toon album</string> + <string name="download.menu_lyrics">Songteksten</string> + <string name="download.menu_remove_all">Verwijder alles</string> + <string name="download.menu_screen_on">Scherm aan</string> + <string name="download.menu_shuffle">Shuffle</string> + <string name="download.menu_toggle">Aan\/Uit</string> + <string name="download.menu_save">Bewaar speellijst</string> + <string name="download.menu_shuffle_notification">Speellijst was geshufffeld</string> + <string name="download.menu_remove_played_songs">Verwijder afgespeelde nummers</string> + <string name="download.playlist_title">Bewaar playlist</string> + <string name="download.playlist_name">Voer de naam in van de playlist:</string> + <string name="download.playlist_saving">Playlist \"%s\ wordt opgeslagen"...</string> + <string name="download.playlist_done">Playlist was succesvol opgeslagen.</string> + <string name="download.playlist_error">Niet gelukt playlist op te slaan, probeer het later nog eens.</string> + <string name="download.repeat_off">Herhalen uit</string> + <string name="download.repeat_all">Herhaal alles</string> + <string name="download.repeat_single">Herhaal nummer</string> + <string name="download.jukebox_server_too_old">Afstandbediending wordt niet ondersteund. Upgrade de Subsonic server.</string> + <string name="download.jukebox_offline">Afstandbediending is in offline mode niet beschikbaar.</string> + <string name="download.jukebox_not_authorized">Afstandbediening is niet toegestaan. Zet de jukebox mode aan in <b>Users > Instellingen</b> op je Subsonic server.</string> + <string name="download.start_timer">Start Timer</string> + <string name="download.stop_time_remaining">Stop in %1$s</string> + <string name="download.need_download">Video moet eerst gedownload worden</string> + <string name="download.no_streaming_player">Deze stream kan niet afgespeeld worden</string> + <string name="download.playing_out_of">Speelt: %1$d/%2$d</string> + <string name="download.save_bookmark_title">Cre\ëer bladwijzer</string> + <string name="download.save_bookmark">Bladwijzer aangemaakt</string> + <string name="download.save_bookmark_failed">Niet gelukt om bladwijzer te maken</string> + <string name="download.downloading_title">Downloaden %1$d nummers</string> + <string name="download.downloading_summary">Huidig: %1$s</string> + <string name="download.downloading_summary_expanded">Huidig: %1$s + \nGeschatte grootte: %2$s</string> + <string name="download.failed_to_load">Niet gelukt te laden</string> + <string name="download.restore_play_queue">Ga verder waar je op een ander apparaat gestopt bent bij</string> + <string name="download.thumbs_up">Duim omhoog</string> + <string name="download.thumbs_down">Duim omlaag</string> + + <string name="sync.new_podcasts">Nieuwe podcasts beschikbaar</string> + <string name="sync.new_playlists">Nieuwe nummers in playlists</string> + <string name="sync.new_albums">Nieuwe albums beschikbaar</string> + <string name="sync.new_starred">Nieuwe nummers met sterren beschikbaar</string> + + <string name="starring_content_starred">Met sterren \"%s\"</string> + <string name="starring_content_unstarred">Zoner sterren \"%s\"</string> + <string name="starring_content_error">Kon \"%s\" niet updaten, probeer het later nog eens.</string> + + <string name="playlist.mine">Mijn playlists</string> + <string name="playlist.shared">Gedeelde playlists</string> + <string name="playlist_error">Niet gelukt de lijst playlists op te halen</string> + <string name="updated_playlist">Toegevoegd %1$s nummer aan \"%2$s\"</string> + <string name="updated_playlist_error">Niet gelukt te updaten \"%s\", probeer later nog eens.</string> + <string name="removed_playlist">Verwijderd %1$s nummers van \"%2$s\"</string> + + <string name="bookmark.delete">Verwijder bladwijzer</string> + <string name="bookmark.delete_title">Verwijder de bladwijzer voor</string> + <string name="bookmark.deleted">Bladwijzer verwijderd voor \"%s\"</string> + <string name="bookmark.deleted_error">Niet gelukt om bladwijzer te verwijderen voor \"%s\"</string> + <string name="bookmark.details_title">Bladwijzer details</string> + <string name="bookmark.resume_title">Hervat afspelen?</string> + <string name="bookmark.resume">Hervat afspelen \'%1$s\' van %2$s</string> + <string name="bookmark.action_resume">Hervat</string> + <string name="bookmark.action_start_over">Start opnieuw</string> + + <string name="rating.title">Beoordeling \"%s\"</string> + <string name="rating.set_rating">Beoordeling ingesteld voor \"%s\"</string> + <string name="rating.set_rating_failed">Niet gelukt beoordeling in te stellen voor \"%s\"</string> + <string name="rating.remove_rating">Beoordeling verwijderd voor \"%s\"</string> + <string name="rating.remove_rating_failed">Niet gelukt beoordeling te verwijderen voor \"%s\"</string> + + <string name="song_details.error">Fout</string> + <string name="song_details.skipped">Overgeslagen</string> + <string name="song_details.downloading">Downloaden</string> + + <string name="lyrics.nomatch">Geen songteksten gevonden</string> + + <string name="error.label">Fout</string> + + <string name="settings.title">Instellingen</string> + <string name="settings.test_connection_title">Test verbinding</string> + <string name="settings.servers_add">Voeg server toe</string> + <string name="settings.servers_remove">Verwijder server</string> + <string name="settings.servers_title">Servers</string> + <string name="settings.server_unused">Ongebruikt</string> + <string name="settings.server_name">Naam</string> + <string name="settings.server_address">Server addres</string> + <string name="settings.server_local_network_ssid" >Lokaal netwerk SSID</string> + <string name="settings.server_local_network_ssid_hint">Huidig SSID: %s</string> + <string name="settings.server_internal_address">Lokaal netwerk adres</string> + <string name="settings.server_username">Gebruikersnaam</string> + <string name="settings.server_password">Wachtwoord</string> + <string name="settings.server_open_browser">Open in browser</string> + <string name="settings.server_sync_summary">Of synchronisatie ingesteld is voor deze server</string> + <string name="settings.server_sync">Synchronisatie ingesteld</string> + <string name="settings.cache_title">Muziek cache</string> + <string name="settings.preload_wifi">Nummers vooraf laden (Wifi)</string> + <string name="settings.preload_mobile">Nummers vooraf laden (Mobiel)</string> + <string name="settings.cache_size">Cache grootte</string> + <string name="settings.cache_location">Cache locatie</string> + <string name="settings.cache_location_error">Onjuiste cache locatie. Standaard wordt gebruikt.</string> + <string name="settings.cache_location_reset">De locatie van de cache die u hebt ingesteld is niet meer beschrijfbaar. Als onlangs uw Android telefoon geüpgraded is naar KitKat 4.4 en hoger, dan is de manier waarop apps naar de SD-kaart schrijven veranderd zodat er alleen naar een specifieke locatie geschreven kan worden. De locatie die DSub gebruikt is al automatisch veranderd naar de juiste locatie. Om de oude app-data te verwijderen, moet de SD-kaart gekoppeld worden aan een computer om de oude folder handmatig te verwijderen.</string> + <string name="settings.cache_clear">Cache legen</string> + <string name="settings.cache_clear_complete">Klaar met cache legen</string> + <string name="settings.testing_connection">Verbinding testen...</string> + <string name="settings.testing_ok">De verbinding is OK</string> + <string name="settings.testing_unlicensed">Verbinding is OK. Server niet gelicenseerd.</string> + <string name="settings.connection_failure">Verbinding mislukt.</string> + <string name="settings.invalid_url">Geef een valide URL op.</string> + <string name="settings.invalid_username">Geef een valide gebruikersnaam op (geen volgspaties).</string> + <string name="settings.appearance_title">Uiterlijk</string> + <string name="settings.theme_title">Thema</string> + <string name="settings.theme_light">Licht</string> + <string name="settings.theme_dark">Donker</string> + <string name="settings.theme_black">Zwart</string> + <string name="settings.theme_holo">Holo</string> + <string name="settings.theme_fullscreen">Schermvullend</string> + <string name="settings.theme_fullscreen_summary">Verberg zoveel mogelijk schermelementen als Android toestaat</string> + <string name="settings.track_title">Toon track #</string> + <string name="settings.track_summary">Toon track # voor een nummer indien er een bestaat</string> + <string name="settings.custom_sort">Sorteer op jaartal</string> + <string name="settings.custom_sort_summary">Sorteer albums op jaartal, of alfabetisch</string> + <string name="settings.open_to_tab">Open naar tabblad</string> + <string name="settings.open_to_tab_summary">Open direct naar dit tabblad</string> + <string name="settings.network_title">Netwerk</string> + <string name="settings.max_bitrate_wifi">Max audio bitrate - wifi</string> + <string name="settings.max_bitrate_mobile">Max audio bitrate - mobiel</string> + <string name="settings.max_bitrate_32">32 Kbps</string> + <string name="settings.max_bitrate_64">64 Kbps</string> + <string name="settings.max_bitrate_80">80 Kbps</string> + <string name="settings.max_bitrate_96">96 Kbps</string> + <string name="settings.max_bitrate_112">112 Kbps</string> + <string name="settings.max_bitrate_128">128 Kbps</string> + <string name="settings.max_bitrate_160">160 Kbps</string> + <string name="settings.max_bitrate_192">192 Kbps</string> + <string name="settings.max_bitrate_256">256 Kbps</string> + <string name="settings.max_bitrate_320">320 Kbps</string> + <string name="settings.max_video_bitrate_wifi">Max video bitrate - wifi</string> + <string name="settings.max_video_bitrate_mobile">Max video bitrate - mobiel</string> + <string name="settings.max_video_bitrate_200">200 Kbps</string> + <string name="settings.max_video_bitrate_300">300 Kbps</string> + <string name="settings.max_video_bitrate_400">400 Kbps</string> + <string name="settings.max_video_bitrate_500">500 Kbps</string> + <string name="settings.max_video_bitrate_700">700 Kbps</string> + <string name="settings.max_video_bitrate_1000">1000 Kbps</string> + <string name="settings.max_video_bitrate_1500">1500 Kbps</string> + <string name="settings.max_video_bitrate_2000">2000 Kbps</string> + <string name="settings.max_video_bitrate_3000">3000 Kbps</string> + <string name="settings.max_video_bitrate_5000">5000 Kbps</string> + <string name="settings.max_bitrate_unlimited">Unlimited</string> + <string name="settings.wifi_required_title">Alleen wifi streaming</string> + <string name="settings.wifi_required_summary">Alleen media streamen wanneer verbonden met wifi.</string> + <string name="settings.network_timeout_title">Netwerk timeout</string> + <string name="settings.network_timeout_10000">10 seconds</string> + <string name="settings.network_timeout_15000">15 seconds</string> + <string name="settings.network_timeout_30000">30 seconds</string> + <string name="settings.network_timeout_45000">45 seconds</string> + <string name="settings.network_timeout_60000">60 seconds</string> + <string name="settings.preload_0">0 nummer</string> + <string name="settings.preload_1">1 nummer</string> + <string name="settings.preload_2">2 nummers</string> + <string name="settings.preload_3">3 nummers</string> + <string name="settings.preload_5">5 nummers</string> + <string name="settings.preload_10">10 nummers</string> + <string name="settings.preload_unlimited">Onbeperkt</string> + <string name="settings.clear_search_history">Verwijder zoekgeschiedenis</string> + <string name="settings.search_history_cleared">Zoekgeschiedenis verwijderd</string> + <string name="settings.other_title">Andere instellingen</string> + <string name="settings.scrobble_title">Scrobble naar Last.fm</string> + <string name="settings.scrobble_summary">Vergeet niet om je last.fm account in te stellen op de Subsonic server.</string> + <string name="settings.hide_media_title">Verberg voor andere</string> + <string name="settings.hide_media_summary">Verberg muziek voor andere apps.</string> + <string name="settings.hide_media_toast">Is actief wanneer Android de volgende keer je telefoon scant voor nieuwe muziek.</string> + <string name="settings.media_button_title">Mediaknoppen</string> + <string name="settings.media_button_summary">Reageer op telefoon, koptelefoon en bluetooth mediaknoppen</string> + <string name="settings.screen_lit_title">Houd scherm aan</string> + <string name="settings.screen_lit_summary">Houdt scherm aan tijdens het downloaden verbetert de download snelheid.</string> + <string name="settings.playlist_title">Afspelen</string> + <string name="settings.playlist_random_size_title">Shuffle playlist grootte</string> + <string name="settings.sleep_timer_title">Sleeptimer</string> + <string name="settings.sleep_timer_duration_title">Sleeptimer duur</string> + <string name="settings.sleep_timer_off">Uit</string> + <string name="settings.sleep_timer_on">Aan</string> + <string name="settings.sleep_timer_always_on">Altijd aan</string> + <string name="settings.temp_loss_title">Tijdelijk focus verlies</string> + <string name="settings.temp_loss_pause">Altijd pauzeren</string> + <string name="settings.temp_loss_pause_lower">Pauze, lagere volume desgevraagd</string> + <string name="settings.temp_loss_lower">Altijd lagere volume</string> + <string name="settings.temp_loss_nothing">Doe niets</string> + <string name="settings.keep_played_count_title">Behoud afgespeelde nummers</string> + <string name="settings.keep_played_count_none">Verwijder alle afspeelde nummers</string> + <string name="settings.keep_played_count_one">Behoud laatste afgespeelde nummers</string> + <string name="settings.keep_played_count_two">Behoud laatste 2 afgespeelde nummers</string> + <string name="settings.keep_played_count_three">Behoud laatste 3 afgespeelde nummers</string> + <string name="settings.disconnect_pause_title">Pauzeren bij verbroken verbinding</string> + <string name="settings.disconnect_pause_both">Pauzeren</string> + <string name="settings.disconnect_pause_neither">Doe niets</string> + <string name="settings.persistent_title">Permanente vermelding</string> + <string name="settings.persistent_summary">Toon de vermelding zelfs na pauzeren. Druk op de stopknop om de vermelding te verwijderen.</string> + <string name="settings.gapless_playback">Ononderbroken afspelen</string> + <string name="settings.gapless_playback_summary">Indien je vreemde storingen ondervindt tijdens het afspelen, kan het uitzetten van deze functie misschien helpen.</string> + <string name="settings.chat_refresh">Chat vernieuwingsfrequentie (sec.)</string> + <string name="settings.chat_enabled">Chat aanzetten</string> + <string name="settings.chat_enabled_summary">Al dan niet weergeven van de chatlijst in de lade</string> + <string name="settings.video_title">Video</string> + <string name="settings.video_player">Videospeler</string> + <string name="settings.video_raw">Raw (Vereist Subsonic 4.8+)</string> + <string name="settings.video_hls">HTTP Live Stream (HLS) (Vereist Subsonic 4.8+)</string> + <string name="settings.video_transcode">Direct Transcode (Vereist video -> mp4 or similar setup on Server)</string> + <string name="settings.video_flash">Flash (Vereist plugin)</string> + <string name="settings.cache_screen_title">Cache/Netwerk</string> + <string name="settings.playback_title">Playback</string> + <string name="settings.hide_widget_title">Widget verbergen</string> + <string name="settings.hide_widget_summary">Verberg widget na verlaten app</string> + <string name="settings.podcasts_enabled">Podcasts ingeschakeld</string> + <string name="settings.podcasts_enabled_summary">Al dan niet weergeven van de podcastlijst in de lade</string> + <string name="settings.bookmarks_enabled">Bladwijzers ingeschakelPlayback</string> + <string name="settings.bookmarks_enabled_summary">Al dan niet weergeven van de bladwijzerlijst in de lade</string> + <string name="settings.shares_enabled">Shares ingeschakeld</string> + <string name="settings.shares_enabled_summary">Al dan niet weergeven van de shareslijst in de lade</string> + <string name="settings.sync_title">Sync</string> + <string name="settings.sync_enabled">Sync ingeschakeld</string> + <string name="settings.sync_enabled_summary">Al dan of niet playlists of padcasts periodiek gecontroleerd worden op wijzigingen</string> + <string name="settings.sync_interval">Sync interval</string> + <string name="settings.sync_interval_15">15 minuten</string> + <string name="settings.sync_interval_30">30 minute</string> + <string name="settings.sync_interval_60">1 uur</string> + <string name="settings.sync_interval_120">2 uren</string> + <string name="settings.sync_interval_240">4 uren</string> + <string name="settings.sync_interval_360">6 uren</string> + <string name="settings.sync_interval_720">12 uren</string> + <string name="settings.sync_interval_1440">Dagelijks</string> + <string name="settings.sync_wifi">Sync alleen met wifi</string> + <string name="settings.sync_wifi_summary">Alleen synchroniseren met een wifi-verbinding</string> + <string name="settings.sync_most_recent">Sync recentelijk toegevoegd</string> + <string name="settings.sync_most_recent_summary">Automatisch cache nieuw toegevoegde albums</string> + <string name="settings.sync_starred">Sync met sterren</string> + <string name="settings.sync_starred_summary">Cache automatisch nummers, album en artiesten met sterren</string> + <string name="settings.sync_notification">Toon sync notificatie</string> + <string name="settings.sync_notification_summary">Toon een notificatie nadat er nieuwe media is gesynct</string> + <string name="settings.menu_options.title">Optionele menu opties</string> + <string name="settings.menu_options.play_now_summary">Toon nu in menus</string> + <string name="settings.menu_options.play_shuffled_summary">Toon Shuffled in menu\'s</string> + <string name="settings.menu_options.play_next_summary">Toon Speel Volgend in menu\'s</string> + <string name="settings.menu_options.play_last_summary">Toon Speel Laatst in menu\'s</string> + <string name="settings.menu_options.download_summary">Toon Download in menu\'s</string> + <string name="settings.menu_options.pin_summary">Toon Permanente Cache in menu\'s</string> + <string name="settings.menu_options.delete_summary">Toon Verwijder in menu\'s</string> + <string name="settings.menu_options.star_summary">Toon Ster in menu\'s</string> + <string name="settings.menu_options.shared_summary">Toon Share in menu\'s</string> + <string name="settings.menu_options.rate_summary">Toon Waarderingen in menu\'s</string> + <string name="settings.browse_by_tags">Bladeren door tags</string> + <string name="settings.browse_by_tags_summary">Bladeren door tags in plaats van folder structuur. Vereist Subsonic 4.7+</string> + <string name="settings.disable_exit_prompt">Exit Prompt uitschakelen</string> + <string name="settings.disable_exit_prompt_summary">Verlaat meteen de app bij het op back drukken vanuit het Home scherm</string> + <string name="settings.override_system_language">Systeemtaal overschrijven</string> + <string name="settings.override_system_language_summary">Toon de app in Engels, ook als de systeemtaal voor Dsub beschikbaar is. Het is misschien nodig om de app uit cache geheugen te wissen voordat het effectief is.</string> + <string name="settings.drawer_items_title">Server tabs</string> + <string name="settings.large_album_art">Grote albumhoezen</string> + <string name="settings.large_album_art_summary">Toon albums met grote hoes in plaats van een lijst</string> + <string name="settings.admin_enabled">Beheer ingeschakeld</string> + <string name="settings.admin_enabled_summary">Al dan niet weergeven van de adminlijst in de lade</string> + <string name="settings.replay_gain">Normaliseren</string> + <string name="settings.replay_gain_summary">Aldan of niet de afspeelvolume per nummer of album normaliseren adhv (replay gain) tags</string> + <string name="settings.replay_gain_type">Lees van tags</string> + <string name="settings.replay_gain_type.smart">Slimme detectie</string> + <string name="settings.replay_gain_type.album">Album tags</string> + <string name="settings.replay_gain_type.track">Nummer tags</string> + <string name="settings.replay_gain_bump">Normaliseren Pre-amp</string> + <string name="settings.replay_gain_untagged">Nummers zonder normalisatie</string> + <string name="settings.casting">Casten</string> + <string name="settings.casting_proxy">Gebruik apparaat proxy</string> + <string name="settings.casting_proxy_summary">Stream alles via het apparaat als een proxy. Dit omzeilt problemen zoals zelf toegekende certificaten.</string> + <string name="settings.rename_duplicates">Hernoem dubbele nummers</string> + <string name="settings.rename_duplicates_summary">Hernoem dubbele nummers naar de originele bestandsnaam om ze te kunnen onderscheiden.</string> + <string name="settings.start_on_headphones">Start met koptelefoon</string> + <string name="settings.start_on_headphones_summary">Start als een koptelefoon gekoppeld wordt. Dit vereist het gebruik van een service bij het opstarten van de telefoon om de de koptelefoonplugin te monitoren, zelfs als Dsub niet gebruikt wordt.</string> + <string name="settings.color_action_bar">Kleur actiebalk</string> + <string name="settings.color_action_bar.summary">Kleur de actiebalk en statusbalk, of laat ze ongemoeid.</string> + <string name="settings.shuffle_by_album">Shuffle op basis van albums</string> + <string name="settings.shuffle_by_album.true">Shuffle de volgorde van albums</string> + <string name="settings.shuffle_by_album.false">Shuffle alle nummers</string> + + <string name="shuffle.title">Shuffle op basis van</string> + <string name="shuffle.startYear">Start jaar:</string> + <string name="shuffle.endYear">Einde jaar:</string> + <string name="shuffle.genre">Genre:</string> + <string name="shuffle.pick_genre">Kies een genre</string> + + <string name="share.expires">Vervaldatum: %s</string> + <string name="share.expires_never">Verloopt nooit</string> + <string name="share.deleted">Verwijderde share %s</string> + <string name="share.deleted_error">Mislukt om de share %s te verwijderen</string> + <string name="share.no_expiration">Verloopt nooit</string> + <string name="share.expiration">Verloopt:</string> + <string name="share.updated_info">Share informatie geüpdatet voor %s</string> + <string name="share.updated_info_error">Mislukt om share informatie te updaten voor %s</string> + <string name="share.via">Share via</string> + <string name="share.delete">Verwijder share</string> + + <string name="admin.add_user_username">Gebruikersnaam:</string> + <string name="admin.add_user_email">E-mail:</string> + <string name="admin.add_user_password">Wachtwoord:</string> + <string name="admin.create_user_success">Succesvol niet gebruiker aangemaakt</string> + <string name="admin.create_user_error">Mislukt nieuwe gebruiker aan te maken</string> + <string name="admin.change_username_invalid">Voer valide gebruikersnaam in</string> + <string name="admin.update_permissions">Update machtigingen</string> + <string name="admin.update_permissions_success">Succesvol machtigingen geüpdatet voor %1$s</string> + <string name="admin.update_permissions_error">Mislukt om machtigingen te updaten voor %1$s</string> + <string name="admin.change_email">Wijzig e-mail</string> + <string name="admin.change_email_success">Succesvol e-mail gewijzigd voor %1$s</string> + <string name="admin.change_email_error">Mislukt om e-mail te wijzigen voor %1$s</string> + <string name="admin.change_email_label">Nieuwe e-mail:</string> + <string name="admin.change_email_invalid">Voor een valide e-mail in</string> + <string name="admin.change_password">Wijzig wachtwoord</string> + <string name="admin.change_password_success">Succesvol wachtwoord gewijzigd voor %1$s</string> + <string name="admin.change_password_error">Mislukt om wachtwoord te wijzigen voor %1$s</string> + <string name="admin.change_password_label">Nieuw wachtwoord:</string> + <string name="admin.change_password_invalid">Voerin een valide wachtwoord</string> + <string name="admin.delete_user">Verwijder gebruiker</string> + <string name="admin.delete_user_success">Succesvol %1$s verwijderd</string> + <string name="admin.delete_user_error">Mislukt om %1$s te verwijderen</string> + <string name="admin.confirm_password">Bevestig wachtwoord</string> + <string name="admin.confirm_password_bad">Ingevoerde wachtwoord is onjuist</string> + + <string name="admin.scrobblingEnabled">Scrobbelen toegestaan</string> + <string name="admin.role.admin">Beheerder</string> + <string name="admin.role.settings">Verander instellingen</string> + <string name="admin.role.download">Download originele bestanden</string> + <string name="admin.role.upload">Upload naar server</string> + <string name="admin.role.coverArt">Wijzig hoes</string> + <string name="admin.role.comment">Voeg commentaar toe</string> + <string name="admin.role.podcast">Beheer podcasts</string> + <string name="admin.role.stream">Muziek streamen</string> + <string name="admin.role.jukebox">Beheer jukebox</string> + <string name="admin.role.share">Beheer shares</string> + <string name="admin.role.lastfm">Gebruik Last.FM functie</string> + + <string name="music_service.retry">Er is een netwerkfout opgetreden. Probeer opnieuw %1$d van %2$d.</string> + + <string name="background_task.no_network">Dit programma het netwerktoegang nodig. Zet wifi of mobiel netwerk aan.</string> + <string name="background_task.network_error">Er is een netwerkfout opgetreden. Controleer het serveradres of probeer het later nog eens.</string> + <string name="background_task.not_found">De bron is niet gevonden. Controleer het serveradres.</string> + <string name="background_task.parse_error">Er is een communicatieprobleem ontstaan met de server. Controleer het serveradres en verifieer dat je met een webbrowser vanaf je apparaat een verbinding kan maken met het serveradres.</string> + + <string name="service.connecting">Serververbinding wordt opgezet, moment geduld a.u.b.</string> + + <string name="parser.upgrade_client">Onverenigbare versies. DSub upgraden a.u.b.</string> + <string name="parser.upgrade_server">Onverenigbare versies. Subsonic server upgraden a.u.b.</string> + <string name="parser.not_authenticated">Verkeerde gebruikersnaam of wachtwoord.</string> + <string name="parser.not_authorized">Niet geautoriseerd. Controleer de gebruikerspermissies op Subsonic server.</string> + <string name="parser.artist_count">Heb %d artiesten.</string> + <string name="parser.server_error">Server fout: %s</string> + <string name="parser.scan_count">%d Items gescand</string> + + <string name="select_artist.folder">Selecteer map</string> + <string name="select_artist.all_folders">Alle mappen</string> + + <string name="equalizer.label">Equalizer</string> + <string name="equalizer.enabled">Ingeschakeld</string> + <string name="equalizer.preset">Selecteer voorinstelling</string> + <string name="equalizer.bass_booster">Bass booster</string> + <string name="equalizer.voice_booster">Stem booster</string> + <string name="equalizer.db_size">%d dB</string> + <string name="equalizer.bass_size">%d mille</string> + + <string name="widget.4x1">DSub (4x1)</string> + <string name="widget.4x2">DSub (4x2)</string> + <string name="widget.4x3">DSub (4x3)</string> + <string name="widget.4x4">DSub (4x4)</string> + <string name="widget.initial_text">Aanraken om muziek te selecteren</string> + <string name="widget.sdcard_busy">SD-kaart onbeschikbaar</string> + <string name="widget.sdcard_missing">Geen SD-kaart</string> + + <string name="util.bytes_format.gigabyte">0.00 GB</string> + <string name="util.bytes_format.megabyte">0.00 MB</string> + <string name="util.bytes_format.kilobyte">0 KB</string> + <string name="util.bytes_format.byte">0 B</string> + + <string name="changelog_full_title">Verander Log</string> + <string name="changelog_title">Wat is er nieuw</string> + <string name="changelog_ok_button">OK</string> + <string name="changelog_show_full">Meer…</string> + + <string name="chat.send_a_message">Stuur een bericht</string> + + <string name="changelog_version_format">Versie %s</string> + + <string name="tasker.start_playing">Begin met spelen</string> + <string name="tasker.start_playing_shuffled">Begin met spelen in shuffle-modus</string> + <string name="tasker.start_playing_title">Tasker -> Start DSub</string> + <string name="tasker.edit_shuffle_mode">Start in shuffle-modus: </string> + <string name="tasker.edit_shuffle_start_year">Shuffle start jaar:</string> + <string name="tasker.edit_shuffle_end_year">Shuffle einde jaar:</string> + <string name="tasker.edit_shuffle_genre">Shuffle genre:</string> + <string name="tasker.edit_server_offline">Schakel offline: </string> + <string name="tasker.edit_do_nothing">Doe niets</string> + + <string name="details.title.song">Nummer details</string> + <string name="details.title.album">Album details</string> + <string name="details.title.podcast">Podcast details</string> + <string name="details.title.playlist">Playlist details</string> + <string name="details.title.artist">Artiest details</string> + <string name="details.podcast">Podcast</string> + <string name="details.status">Status</string> + <string name="details.artist">Artiest</string> + <string name="details.album">Album</string> + <string name="details.track">Nummer</string> + <string name="details.genre">Genre</string> + <string name="details.year">Jaar</string> + <string name="details.server_format">Server format</string> + <string name="details.server_bitrate">Server bitrate</string> + <string name="details.cached_format">Cached format</string> + <string name="details.cached_bitrate">Gecacht bitrate</string> + <string name="details.size">Grootte</string> + <string name="details.length">Lengte</string> + <string name="details.bookmark_position">Bookmark positie</string> + <string name="details.rating">Beoordeling</string> + <string name="details.description">Beschrijving</string> + <string name="details.owner">Eigenaar</string> + <string name="details.comments">Opmerkingen</string> + <string name="details.song_count">Nummer telling</string> + <string name="details.public">Publiek</string> + <string name="details.created">Gecreëerd</string> + <string name="details.title">Titel</string> + <string name="details.url">URL</string> + <string name="details.error">Foutmelding</string> + <string name="details.author">Auteur</string> + <string name="details.email">E-mail</string> + <string name="details.version">Versie</string> + <string name="details.files_cached">Bestanden gecached</string> + <string name="details.files_permanent">Permanent gecached</string> + <string name="details.used_space">Gebruikte ruimte</string> + <string name="details.available_space">Beschikbare ruimte</string> + <string name="details.of">%1$s van %2$s</string> + <string name="details.song">Nummer</string> + <string name="details.position">Positie</string> + <string name="details.updated">Geüpdatet</string> + <string name="details.starred">Met ster</string> + <string name="details.last_played">Laatst afgespeeld</string> + + <plurals name="select_album_n_songs"> + <item quantity="zero">Geen nummer</item> + <item quantity="one">Een nummer</item> + <item quantity="other">%d nummers</item> + </plurals> + <plurals name="select_album_n_songs_downloading"> + <item quantity="one">Een nummer geplanned om te downloaden</item> + <item quantity="other">%d nummers geplanned om te downloaden.</item> + </plurals> + <plurals name="select_album_n_songs_added"> + <item quantity="one">Een nummer toegevoegd aan de speellijst</item> + <item quantity="other">%d nummers toegevoegd aan de speellijst.</item> + </plurals> + <plurals name="select_album_donate_dialog_n_trial_days_left"> + <item quantity="one">Eén dag over van proefperiode</item> + <item quantity="other">%d dagen over van proefperiode</item> + </plurals> + +</resources> + diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index ffbb0485..97ba1880 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -24,7 +24,6 @@ <string name="button_bar.home">Домой</string> <string name="button_bar.browse">Медиатека</string> - <string name="button_bar.search">Поиск</string> <string name="button_bar.playlists">Списки</string> <string name="button_bar.now_playing">Плеер</string> @@ -32,7 +31,6 @@ <string name="main.welcome_text">Добро пожаловать в DSub! Это приложение настроено на работу с демо сервером Subsonic. После настройки Вашего персонального сервера (доступен на <b>subsonic.org</b>), пожалуйста, перейдите в <b>Настройки</b> и измените параметры для подключения.</string> <string name="main.about_title">О программе DSub</string> - <string name="main.select_server">Выбрать сервер</string> <string name="main.shuffle">Случайное воспроизведение</string> <string name="main.offline">Отключиться</string> <string name="main.online">Подключиться</string> @@ -74,18 +72,11 @@ <string name="search.artists">Исполнители</string> <string name="search.albums">Альбомы</string> <string name="search.songs">Композиции</string> - <string name="search.more">Показать еще</string> <string name="progress.wait">Пожалуйста, подождите...</string> - <string name="music_library.label">Медиатека</string> - <string name="music_library.label_offline">Оффлайн медиа</string> - - <string name="select_album.select">Выбрать все</string> <string name="select_album.n_selected">%d композиций выбрано.</string> - <string name="select_album.more">Еще</string> <string name="select_album.offline">Оффлайн</string> - <string name="select_album.searching">Выполняется поиск...</string> <string name="select_album.no_sdcard">Ошибка: SD карта недоступна</string> <string name="select_album.no_network">Внимание: сеть недоступна.</string> <string name="select_album.not_licensed">Сервер не лицензирован. %d дней до окончания пробного периода.</string> @@ -115,14 +106,10 @@ <string name="download.repeat_off">Повторение отключено</string> <string name="download.repeat_all">Повторять все</string> <string name="download.repeat_single">Повторять композицию</string> - <string name="download.jukebox_on">Удаленное управление включено. Музыка воспроизводится на компьютере.</string> - <string name="download.jukebox_off">Удаленное управление отключено. Музыка воспроизводится на устройстве.</string> - <string name="download.jukebox_volume">Удаленное управление громкостью</string> <string name="download.jukebox_server_too_old">Удаленное управление не поддерживается. Пожалуйста, обновите Ваш сервер Subsonic.</string> <string name="download.jukebox_offline">Удаленное управление не поддерживается в оффлайн режиме.</string> <string name="download.jukebox_not_authorized">Удаленное управление запрещено. Пожалуйста, активируйте режим jukebox в разделе <b>Настройки > Проигрыватели</b> на вашем сервере Subsonic.</string> - <string name="download.timer_length">Длительность</string> - <string name="download.start_timer">Запустить таймер</string> + <string name="download.start_timer">Запустить таймер</string> <string name="download.need_download">Необходимо сначала скачать видео</string> <string name="download.no_streaming_player">Нет плеера для воспроизведения потока</string> @@ -233,8 +220,6 @@ <string name="music_service.retry">Ошибка подключения. Попытка %1$d из %2$d.</string> - <string name="background_task.wait">Пожалуйста, подождите...</string> - <string name="background_task.loading">Загрузка</string> <string name="background_task.no_network">Эта программа требует доступ к сети. Пожалуйста, включите Wi-Fi или мобильный интернет</string> <string name="background_task.network_error">Ошибка сети. Пожалуйста, проверьте адрес сервера и попробуйте снова</string> <string name="background_task.not_found">Ресурс не найден. Пожалуйста, проверьте адрес сервера</string> @@ -248,7 +233,6 @@ <string name="parser.not_authorized">Не авторизирован. Проверьте права пользователя на сервере Subsonic.</string> <string name="parser.artist_count">Получено %d исполнителей.</string> - <string name="select_artist.refresh">Обновить</string> <string name="select_artist.folder">Выбрать папку</string> <string name="select_artist.all_folders">Все папки</string> diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 38add733..ac219530 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -32,8 +32,7 @@ <string name="button_bar.home">Hem</string> <string name="button_bar.browse">Bibliotek</string> - <string name="button_bar.search">Sök</string> - <string name="button_bar.playlists">Spellista</string> + <string name="button_bar.playlists">Spellista</string> <string name="button_bar.now_playing">Spelar nu</string> <string name="button_bar.podcasts">Podcasts</string> <string name="button_bar.bookmarks">Bokmärken</string> @@ -58,8 +57,7 @@ <br/>Avmarkera "Första steget artister" i inställningsmenyn. Det kommer göra så att hela första steget kommer att hanteras som grupper istället för som enstaka artister. ]]> </string> - <string name="main.select_server">Välj server</string> - <string name="main.shuffle">Slumpad uppspelning</string> + <string name="main.shuffle">Slumpad uppspelning</string> <string name="main.offline">Gå Offline</string> <string name="main.online">Gå Online</string> <string name="main.settings">Inställningar</string> @@ -111,7 +109,6 @@ <string name="menu.rate">Sätt betyg </string> <string name="menu.top_tracks">Last.FM topp spår</string> <string name="menu.similar_artists">Liknande artister</string> - <string name="menu.show_missing">Visa saknade</string> <string name="menu.start_radio">Starta radio</string> <string name="menu.first_level_artist">Första steget artister</string> @@ -131,20 +128,13 @@ <string name="search.artists">Artister</string> <string name="search.albums">Album</string> <string name="search.songs">Spår</string> - <string name="search.more">Visa mer</string> - <string name="progress.wait">Vänta...</string> + <string name="progress.wait">Vänta...</string> <string name="progress.artist_info">Laddar information om artist</string> - <string name="music_library.label">Media bibliotek</string> - <string name="music_library.label_offline">Offline media</string> - - <string name="select_album.select">Markera allt</string> - <string name="select_album.n_selected">%d vald.</string> - <string name="select_album.more">Mer</string> - <string name="select_album.offline">Offline</string> - <string name="select_album.searching">Söker...</string> - <string name="select_album.no_sdcard">Error: Inget SD-kort tillgängligt.</string> + <string name="select_album.n_selected">%d vald.</string> + <string name="select_album.offline">Offline</string> + <string name="select_album.no_sdcard">Error: Inget SD-kort tillgängligt.</string> <string name="select_album.no_network">Varning: Inget nätverk tillgängligt.</string> <string name="select_album.no_room">Varning: Du har bara %s kvar</string> <string name="select_album.not_licensed">Servern är inte licenserad. %d testdagar kvar.</string> @@ -203,13 +193,9 @@ <string name="download.repeat_off">Upprepa inte</string> <string name="download.repeat_all">Upprepa alla</string> <string name="download.repeat_single">Upprepa spåret</string> - <string name="download.jukebox_on">Startade fjärrkontroll. Musiken spelas upp på datorn.</string> - <string name="download.jukebox_off">Stängde av fjärrkontroll. Musiken spelas upp på telefonen.</string> - <string name="download.jukebox_volume">Fjärrkontroll volym</string> - <string name="download.jukebox_server_too_old">Fjärrkontroll stöds inte. Uppdatera din Subsonic server.</string> + <string name="download.jukebox_server_too_old">Fjärrkontroll stöds inte. Uppdatera din Subsonic server.</string> <string name="download.jukebox_offline">Fjärrkontroll fungerar inte i offline läge.</string> <string name="download.jukebox_not_authorized">Fjärrkontroll acceptaras inte. Acceptera Jukebox läge i <b>Användare > Inställningar</b> på din Subsonic server.</string> - <string name="download.timer_length">Timer:</string> <string name="download.start_timer">Starta timer</string> <string name="download.stop_time_remaining">Stoppa om %1$s</string> <string name="download.need_download">Videon måste laddas ner först</string> @@ -444,8 +430,6 @@ <string name="settings.override_system_language">Ignorera systemspråket</string> <string name="settings.override_system_language_summary">Visa appen på engelska även om systemet är på ett språk Subsonic har stöd för. Du kan eventuellt behöva rensa appen från minnet för att det ska ta effekt.</string> <string name="settings.drawer_items_title">Sidoflikar</string> - <string name="settings.play_now_after">Spela nu - Efter</string> - <string name="settings.play_now_after_summary">Spela nu i context menyn spelar allt efter spåret (som i Subsonic webb GUI)</string> <string name="settings.large_album_art">Stora album bilder</string> <string name="settings.large_album_art_summary">Visa album med stora bilder istället för en lista</string> <string name="settings.admin_enabled">Admin aktiverad</string> @@ -477,15 +461,6 @@ <string name="shuffle.genre">Genre:</string> <string name="shuffle.pick_genre">Välj en genre</string> - <string name="share.info">Ägare: %1$s - \nBeskrivning: %2$s - \nURL: %3$s - \nSkapad: %4$s - \nSenast besökt: %5$s - \nGår ut: %6$s - \nAntal besök: %7$s - - </string> <string name="share.expires">Går ut: %s</string> <string name="share.expires_never">Går aldrig ut</string> <string name="share.deleted">Tog bort delning %s</string> @@ -537,9 +512,7 @@ <string name="music_service.retry">Ett nätverksproblem har uppstått. Försök %1$d av %2$d.</string> - <string name="background_task.wait">Vänta...</string> - <string name="background_task.loading">Laddar.</string> - <string name="background_task.no_network">Appen kräver nätverk. Slå på Wi-Fi eller mkobil data för att kunna använda den.</string> + <string name="background_task.no_network">Appen kräver nätverk. Slå på Wi-Fi eller mkobil data för att kunna använda den.</string> <string name="background_task.network_error">Ett nätverksproblem uppstod. Kontrollera server adressen och försök igen.</string> <string name="background_task.not_found">Resurs kunde inte hittas. Kontrollera server adressen och försök igen.</string> <string name="background_task.parse_error">Problem med kommunikationen med servern. Kontrollera server adressen och att du kan ansluta till servern via webbläsaren.</string> @@ -554,8 +527,7 @@ <string name="parser.server_error">Server fel: %s</string> <string name="parser.scan_count">Scannade %d rader</string> - <string name="select_artist.refresh">Ladda om</string> - <string name="select_artist.folder">Välj mapp</string> + <string name="select_artist.folder">Välj mapp</string> <string name="select_artist.all_folders">Alla mappar</string> <string name="equalizer.label">Equalizer</string> @@ -586,8 +558,6 @@ <string name="chat.send_a_message">Skicka ett meddelande</string> - <string name="changelog_version_format" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">Version <xliff:g id="version_name">%s</xliff:g></string> - <string name="tasker.start_playing">Börja spela</string> <string name="tasker.start_playing_shuffled">Börja spela i slumpat läge</string> <string name="tasker.start_playing_title">Tasker -> Starta DSub</string> diff --git a/app/src/main/res/values-v21/themes.xml b/app/src/main/res/values-v21/themes.xml index 5c54b75a..6461130a 100644 --- a/app/src/main/res/values-v21/themes.xml +++ b/app/src/main/res/values-v21/themes.xml @@ -7,6 +7,12 @@ <style name="Theme.DSub.Dark" parent="Theme.DSub.Dark.Base"> <item name="android:windowTranslucentStatus">true</item> </style> + <style name="Theme.DSub.Black" parent="Theme.DSub.Black.Base"> + <item name="android:windowTranslucentStatus">true</item> + </style> + <style name="Theme.DSub.Holo" parent="Theme.DSub.Holo.Base"> + <item name="android:windowTranslucentStatus">true</item> + </style> <style name="Theme.DSub.Light.No_Color" parent="Theme.DSub.Light.No_Color.Base"> <item name="android:windowTranslucentStatus">false</item> diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml index a7dd932d..118ccc80 100644 --- a/app/src/main/res/values/arrays.xml +++ b/app/src/main/res/values/arrays.xml @@ -1,24 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - <string-array name="drawerItemsDescriptions"> - <item>Home</item> - <item>Artist</item> - <item>Playlist</item> - <item>Podcast</item> - <item>Bookmark</item> - <item>Share</item> - <item>Chat</item> - <item>Admin</item> - <item>Download</item> - <item>Settings</item> - </string-array> - <string-array name="defaultDrawerItems"> <item>@string/button_bar.home</item> <item>@string/button_bar.browse</item> <item>@string/button_bar.playlists</item> <item>@string/button_bar.podcasts</item> <item>@string/button_bar.bookmarks</item> + <item>@string/button_bar.internet_radio</item> <item>@string/button_bar.shares</item> <item>@string/button_bar.chat</item> </string-array> @@ -29,6 +17,7 @@ <item>Playlist</item> <item>Podcast</item> <item>Bookmark</item> + <item>Internet Radio</item> <item>Share</item> <item>Chat</item> </string-array> @@ -38,6 +27,8 @@ <item>dark</item> <item>black</item> <item>holo</item> + <item>day/night</item> + <item>day/black</item> </string-array> <string-array name="themeNames"> @@ -45,6 +36,8 @@ <item>@string/settings.theme_dark</item> <item>@string/settings.theme_black</item> <item>@string/settings.theme_holo</item> + <item>@string/settings.theme_day_night</item> + <item>@string/settings.theme_day_black_night</item> </string-array> <string-array name="sleepTimerValues"> @@ -81,6 +74,7 @@ <string-array name="maxBitrateValues"> <item>32</item> + <item>48</item> <item>64</item> <item>80</item> <item>96</item> @@ -95,6 +89,7 @@ <string-array name="maxBitrateNames"> <item>@string/settings.max_bitrate_32</item> + <item>@string/settings.max_bitrate_48</item> <item>@string/settings.max_bitrate_64</item> <item>@string/settings.max_bitrate_80</item> <item>@string/settings.max_bitrate_96</item> @@ -235,4 +230,17 @@ <item>@string/main.online</item> <item>@string/main.offline</item> </string-array> + + <string-array name="songPressActionValues"> + <item>single</item> + <item>all</item> + <item>next</item> + <item>last</item> + </string-array> + <string-array name="songPressActionNames"> + <item>@string/settings.song_press_play_single</item> + <item>@string/settings.song_press_play_all</item> + <item>@string/settings.song_press_play_next</item> + <item>@string/settings.song_press_play_last</item> + </string-array> </resources> diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index c4f80478..055726b8 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -3,6 +3,8 @@ <attr name="offline_icon" format="reference"/> <attr name="media_button_backward" format="reference"/> <attr name="media_button_forward" format="reference"/> + <attr name="media_button_rewind" format="reference"/> + <attr name="media_button_fastforward" format="reference"/> <attr name="media_button_pause" format="reference"/> <attr name="media_button_repeat_off" format="reference"/> <attr name="media_button_repeat_single" format="reference"/> @@ -14,6 +16,8 @@ <attr name="actionbar_pause" format="reference"/> <attr name="actionbar_start" format="reference"/> <attr name="actionbar_stop" format="reference"/> + <attr name="actionbar_rewind" format="reference"/> + <attr name="actionbar_fastforward" format="reference"/> <attr name="chat_send" format="reference"/> <attr name="add" format="reference"/> <attr name="download_none" format="reference"/> @@ -37,12 +41,15 @@ <attr name="rating_good" format="reference"/> <attr name="radio" format="reference"/> <attr name="star_outline" format="reference"/> + <attr name="download" format="reference"/> + <attr name="playback_speed" format="reference"/> <attr name="drawerItemsIcons" format="reference"/> <attr name="drawerHome" format="reference"/> <attr name="drawerLibrary" format="reference"/> <attr name="drawerPlaylists" format="reference"/> <attr name="drawerPodcasts" format="reference"/> <attr name="drawerBookmarks" format="reference"/> + <attr name="drawerInternetRadioStations" format="reference"/> <attr name="drawerShares" format="reference"/> <attr name="drawerChat" format="reference"/> <attr name="drawerAdmin" format="reference"/> @@ -55,6 +62,8 @@ <attr name="actionbarBackgroundColor" format="reference"/> <attr name="drawerTitleStyle" format="reference"/> <attr name="drawerSubtitleStyle" format="reference"/> + <attr name="cardBackgroundDrawable" format="reference"/> + <attr name="drawerHeaderBackground" format="reference"/> <declare-styleable name="SeekBarPreference"> <attr name="min" format="integer"/> diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 23a3f4a3..9c53f472 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -6,4 +6,11 @@ <dimen name="AlbumArt.Small">78dip</dimen> <dimen name="AlbumArt.Header">120dip</dimen> <dimen name="Star.Small">20dp</dimen> + <dimen name="SongStatusIcon">24dp</dimen> + <dimen name="Card.Radius">4dp</dimen> + <dimen name="Card.TextLeftPadding">8dp</dimen> + <dimen name="Card.MarginsForShadow">2dp</dimen> + <dimen name="FastScroller.LeftAlignedMargin">6dp</dimen> + <dimen name="FastScroller.NormalBarMargin">4dp</dimen> + <dimen name="FastScroller.RightMargin">4dp</dimen> </resources>
\ No newline at end of file diff --git a/app/src/main/res/values/integers.xml b/app/src/main/res/values/integers.xml index 05bcdb28..db45c591 100644 --- a/app/src/main/res/values/integers.xml +++ b/app/src/main/res/values/integers.xml @@ -3,4 +3,5 @@ <integer name="Grid.Columns">2</integer> <integer name="Grid.FullScreen.Columns">@integer/Grid.Columns</integer> <integer name="TextDescriptionLength">5</integer> + <integer name="Card.Elevation">10</integer> </resources>
\ 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 3acbff3e..b54e4ff2 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -32,11 +32,11 @@ <string name="button_bar.home">Home</string> <string name="button_bar.browse">Library</string> - <string name="button_bar.search">Search</string> - <string name="button_bar.playlists">Playlists</string> + <string name="button_bar.playlists">Playlists</string> <string name="button_bar.now_playing">Now Playing</string> <string name="button_bar.podcasts">Podcasts</string> <string name="button_bar.bookmarks">Bookmarks</string> + <string name="button_bar.internet_radio">Internet Radio</string> <string name="button_bar.shares">Shares</string> <string name="button_bar.chat">Chat</string> <string name="button_bar.admin">Admin</string> @@ -58,8 +58,7 @@ <br/>In the option menu, deselect "First level artists". This will make it so that the entire first level of directories shown will be treated like groups of artists instead of the artists themselves. ]]> </string> - <string name="main.select_server">Select server</string> - <string name="main.shuffle">Shuffle play</string> + <string name="main.shuffle">Shuffle play</string> <string name="main.offline">Go Offline</string> <string name="main.online">Go Online</string> <string name="main.settings">Settings</string> @@ -76,6 +75,10 @@ <string name="main.albums_alphabetical">Alphabetically</string> <string name="main.videos">Videos</string> <string name="main.songs_genres">@string/main.albums_genres</string> + <string name="main.songs_newest">@string/main.albums_newest</string> + <string name="main.songs_top_played">Top Played</string> + <string name="main.songs_recent">@string/main.albums_recent</string> + <string name="main.songs_frequent">@string/main.albums_frequent</string> <string name="main.back_confirm">Press back again to exit</string> <string name="main.scan_complete">Completed scan of Server</string> <string name="main.artist">Artist</string> @@ -100,7 +103,7 @@ <string name="menu.add_podcast">Add Channel</string> <string name="menu.keep_synced">Keep Synced</string> <string name="menu.stop_sync">Stop syncing</string> - <string name="menu.show_all">Show all media</string> + <string name="menu.show_all">Show all songs</string> <string name="menu.show_artist">Show Artist</string> <string name="menu.share">Share</string> <string name="menu.delete_cache">Delete Cache</string> @@ -111,7 +114,7 @@ <string name="menu.rate">Set Rating</string> <string name="menu.top_tracks">Last.FM Top Tracks</string> <string name="menu.similar_artists">Similar Artists</string> - <string name="menu.show_missing">Show missing</string> + <string name="menu.similar_artists.missing">Missing Artists</string> <string name="menu.start_radio">Start Radio</string> <string name="menu.first_level_artist">First level artists</string> @@ -131,20 +134,13 @@ <string name="search.artists">Artists</string> <string name="search.albums">Albums</string> <string name="search.songs">Songs</string> - <string name="search.more">Show more</string> - <string name="progress.wait">Please wait...</string> + <string name="progress.wait">Please wait...</string> <string name="progress.artist_info">Loading Artist Bio</string> - <string name="music_library.label">Media library</string> - <string name="music_library.label_offline">Offline media</string> - - <string name="select_album.select">Select all</string> - <string name="select_album.n_selected">%d selected.</string> - <string name="select_album.more">More</string> - <string name="select_album.offline">Offline</string> - <string name="select_album.searching">Searching...</string> - <string name="select_album.no_sdcard">Error: No SD card available.</string> + <string name="select_album.n_selected">%d selected.</string> + <string name="select_album.offline">Offline</string> + <string name="select_album.no_sdcard">Error: No SD card available.</string> <string name="select_album.no_network">Warning: No network available.</string> <string name="select_album.no_room">Warning: you only have %s left</string> <string name="select_album.not_licensed">Server not licensed. %d trial days left.</string> @@ -186,7 +182,8 @@ <string name="download.playerstate_downloading">Downloading - %s</string> <string name="download.playerstate_mobile_disabled">Waiting for WiFi network to download</string> <string name="download.playerstate_buffering">Buffering</string> - <string name="download.playerstate_playing_shuffle">Playing shuffle</string> + <string name="download.playerstate_playing_shuffle">Shuffle mode</string> + <string name="download.playerstate_playing_artist_radio">Artist radio</string> <string name="download.menu_show_album">Show Album</string> <string name="download.menu_lyrics">Lyrics</string> <string name="download.menu_remove_all">Remove all</string> @@ -204,13 +201,9 @@ <string name="download.repeat_off">Repeat off</string> <string name="download.repeat_all">Repeat all</string> <string name="download.repeat_single">Repeat song</string> - <string name="download.jukebox_on">Turned on remote control. Music is played on the computer.</string> - <string name="download.jukebox_off">Turned off remote control. Music is played on the phone.</string> - <string name="download.jukebox_volume">Remote volume</string> - <string name="download.jukebox_server_too_old">Remote control is not supported. Please upgrade your Subsonic server.</string> + <string name="download.jukebox_server_too_old">Remote control is not supported. Please upgrade your Subsonic server.</string> <string name="download.jukebox_offline">Remote control is not available in offline mode.</string> <string name="download.jukebox_not_authorized">Remote control is not allowed. Please enable jukebox mode in <b>Users > Settings</b> on your Subsonic server.</string> - <string name="download.timer_length">Timer:</string> <string name="download.start_timer">Start Timer</string> <string name="download.stop_time_remaining">Stop in %1$s</string> <string name="download.need_download">Video needs to be downloaded first</string> @@ -227,6 +220,13 @@ <string name="download.restore_play_queue">continue from where you left off on another device at</string> <string name="download.thumbs_up">Thumbs Up</string> <string name="download.thumbs_down">Thumbs Down</string> + <string name="download.batch_mode">Batch Mode</string> + <string name="download.playback_speed_half">0.5x</string> + <string name="download.playback_speed_normal">1x</string> + <string name="download.playback_speed_one_half">1.5x</string> + <string name="download.playback_speed_double">2x</string> + <string name="download.playback_speed_tripple">3x</string> + <string name="download.playback_speed_custom">Custom</string> <string name="sync.new_podcasts">New podcasts available</string> <string name="sync.new_playlists">New songs in playlists</string> @@ -291,6 +291,8 @@ <string name="settings.cache_location">Cache location</string> <string name="settings.cache_location_error">Invalid cache location. Using default.</string> <string name="settings.cache_location_reset">The cache location you have set is no longer writable. If you recently upgraded your phone OS to KitKat 4.4, then the way apps write to the SD Card has changed so that they can only write to a specific location. The location that DSub uses has already been automatically changed to the correct location. In order to delete all of the old app data, you will need to mount the SD Card on your computer and delete the old folder manually</string> + <string name="settings.cache_location_internal">Internal</string> + <string name="settings.cache_location_external">External</string> <string name="settings.cache_clear">Clear Cache</string> <string name="settings.cache_clear_complete">Finished clearing cache</string> <string name="settings.testing_connection">Testing connection...</string> @@ -305,6 +307,8 @@ <string name="settings.theme_dark">Dark</string> <string name="settings.theme_black">Black</string> <string name="settings.theme_holo">Holo</string> + <string name="settings.theme_day_night">Day/Night</string> + <string name="settings.theme_day_black_night">Day/Black Night</string> <string name="settings.theme_fullscreen">Fullscreen</string> <string name="settings.theme_fullscreen_summary">Hide as many UI elements as Android will allow</string> <string name="settings.track_title">Display Track #</string> @@ -317,6 +321,7 @@ <string name="settings.max_bitrate_wifi">Max Audio bitrate - Wi-Fi</string> <string name="settings.max_bitrate_mobile">Max Audio bitrate - Mobile</string> <string name="settings.max_bitrate_32">32 Kbps</string> + <string name="settings.max_bitrate_48">48 Kbps</string> <string name="settings.max_bitrate_64">64 Kbps</string> <string name="settings.max_bitrate_80">80 Kbps</string> <string name="settings.max_bitrate_96">96 Kbps</string> @@ -380,7 +385,7 @@ <string name="settings.temp_loss_nothing">Do Nothing</string> <string name="settings.keep_played_count_title">Keep played songs</string> <string name="settings.keep_played_count_none">Remove all played songs</string> - <string name="settings.keep_played_count_one">Keep last played songs</string> + <string name="settings.keep_played_count_one">Keep last played song</string> <string name="settings.keep_played_count_two">Keep 2 played songs</string> <string name="settings.keep_played_count_three">Keep 3 played songs</string> <string name="settings.disconnect_pause_title">Pause on Disconnect</string> @@ -407,6 +412,8 @@ <string name="settings.podcasts_enabled_summary">Whether or not to display the podcast listing in the pull out drawer</string> <string name="settings.bookmarks_enabled">Bookmarks Enabled</string> <string name="settings.bookmarks_enabled_summary">Whether or not to display the bookmarks listing in the pull out drawer</string> + <string name="settings.internet_radio_enabled">Internet Radio Enabled</string> + <string name="settings.internet_radio_enabled_summary">Whether or not to display the internet radio listing in the pull out drawer</string> <string name="settings.shares_enabled">Shares Enabled</string> <string name="settings.shares_enabled_summary">Whether or not to display the shares listing in the pull out drawer</string> <string name="settings.sync_title">Sync</string> @@ -447,8 +454,11 @@ <string name="settings.override_system_language">Override System Language</string> <string name="settings.override_system_language_summary">Display app in english even if the system language is something DSub has a translation for. May need to clear the app from memory for changes to take affect.</string> <string name="settings.drawer_items_title">Drawer Tabs</string> - <string name="settings.play_now_after">Play Now - After</string> - <string name="settings.play_now_after_summary">Play Now context menu for a song plays everything after selected item (like the Subsonic web GUI)</string> + <string name="settings.song_press_action">Song Press Action</string> + <string name="settings.song_press_play_single">Play only that song</string> + <string name="settings.song_press_play_all">Adds everything in the album to the Now Playing Queue</string> + <string name="settings.song_press_play_next">Adds song as next song</string> + <string name="settings.song_press_play_last">Adds song to end of Now Playing Queue</string> <string name="settings.large_album_art">Large Album Art</string> <string name="settings.large_album_art_summary">Display albums with large album art instead of in a list</string> <string name="settings.admin_enabled">Admin Enabled</string> @@ -473,6 +483,14 @@ <string name="settings.shuffle_by_album">Shuffle By Album</string> <string name="settings.shuffle_by_album.true">Shuffle order of albums</string> <string name="settings.shuffle_by_album.false">Shuffle all songs together</string> + <string name="settings.casting_stream_original">Stream original</string> + <string name="settings.casting_stream_original_summary">Stream original files where supported by cast device</string> + <string name="settings.heads_up_notification">Heads Up Notifications (5.0+)</string> + <string name="settings.heads_up_notification_summary">Show playing notifications as Heads Up notifications (Android Lollipop+ only)</string> + <string name="settings.casting_cache">Cache While Casting</string> + <string name="settings.casting_cache_summary">Cache currently playing songs while casting</string> + <string name="settings.casting.dlna_casting_enabled">DLNA Enabled</string> + <string name="settings.casting.dlna_casting_enabled.summary">If you are having battery drain problems on Android 7.0 try turning this off</string> <string name="shuffle.title">Shuffle By</string> <string name="shuffle.startYear">Start Year:</string> @@ -480,15 +498,6 @@ <string name="shuffle.genre">Genre:</string> <string name="shuffle.pick_genre">Pick a genre</string> - <string name="share.info">Owner: %1$s - \nDescription: %2$s - \nURL: %3$s - \nCreation: %4$s - \nLast Visited: %5$s - \nExpiration: %6$s - \nVisit Count: %7$s - - </string> <string name="share.expires">Expires: %s</string> <string name="share.expires_never">Never Expires</string> <string name="share.deleted">Deleted share %s</string> @@ -517,6 +526,7 @@ <string name="admin.change_password">Change Password</string> <string name="admin.change_password_success">Successfully changed password for %1$s</string> <string name="admin.change_password_error">Failed to change password for %1$s</string> + <string name="admin.change_password_current_label">Current Password:</string> <string name="admin.change_password_label">New Password:</string> <string name="admin.change_password_invalid">Enter a valid password</string> <string name="admin.delete_user">Delete User</string> @@ -524,6 +534,8 @@ <string name="admin.delete_user_error">Failed to delete %1$s</string> <string name="admin.confirm_password">Confirm Password</string> <string name="admin.confirm_password_bad">Entered password is wrong</string> + <string name="admin.permissions">Permissions</string> + <string name="admin.musicFolders">Music Folders</string> <string name="admin.scrobblingEnabled">Scrobbling allowed</string> <string name="admin.role.admin">Administrator</string> @@ -536,13 +548,12 @@ <string name="admin.role.stream">Stream music</string> <string name="admin.role.jukebox">Control jukebox</string> <string name="admin.role.share">Manage shares</string> + <string name="admin.role.video_conversion">Convert videos</string> <string name="admin.role.lastfm">Use Last.FM feature</string> <string name="music_service.retry">A network error occurred. Retrying %1$d of %2$d.</string> - <string name="background_task.wait">Please wait...</string> - <string name="background_task.loading">Loading.</string> - <string name="background_task.no_network">This program requires network access. Please turn on Wi-Fi or mobile network.</string> + <string name="background_task.no_network">This program requires network access. Please turn on Wi-Fi or mobile network.</string> <string name="background_task.network_error">A network error occurred. Please check the server address or try again later.</string> <string name="background_task.not_found">Resource not found. Please check the server address.</string> <string name="background_task.parse_error">A problem occurred communicating with the server. Please check the server address and verify that you can connect using a regular browser on your device.</string> @@ -557,8 +568,7 @@ <string name="parser.server_error">Server error: %s</string> <string name="parser.scan_count">Scanned %d entries</string> - <string name="select_artist.refresh">Refresh</string> - <string name="select_artist.folder">Select folder</string> + <string name="select_artist.folder">Select folder</string> <string name="select_artist.all_folders">All folders</string> <string name="equalizer.label">Equalizer</string> @@ -589,7 +599,7 @@ <string name="chat.send_a_message">Send a message</string> - <string name="changelog_version_format" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">Version <xliff:g id="version_name">%s</xliff:g></string> + <string name="changelog_version_format">Version %s</string> <string name="tasker.start_playing">Start playing</string> <string name="tasker.start_playing_shuffled">Start playing in Shuffle Mode</string> @@ -606,6 +616,7 @@ <string name="details.title.podcast">Podcast Details</string> <string name="details.title.playlist">Playlist Details</string> <string name="details.title.artist">Artist Details</string> + <string name="details.title.internet_radio_station">Internet Radio Details</string> <string name="details.podcast">Podcast</string> <string name="details.status">Status</string> <string name="details.artist">Artist</string> @@ -643,6 +654,12 @@ <string name="details.updated">Updated</string> <string name="details.starred">Starred</string> <string name="details.last_played">Last Played</string> + <string name="details.expiration">Expiration</string> + <string name="details.played_count">Played Count</string> + <string name="details.stream_url">Stream URL</string> + <string name="details.home_page">Home Page</string> + + <string name="permission.external_storage.failed">DSub cannot function without the ability to write to storage</string> <plurals name="select_album_n_songs"> <item quantity="zero">No songs</item> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 0b45b69e..04d92fa5 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -37,8 +37,8 @@ <item name="android:background">?android:dividerHorizontal</item> </style> - <style name="MoreButton" parent="BasicButton"> - <item name="android:paddingRight">14dip</item> + <style name="MoreButton" parent="@style/BasicButton"> + <item name="android:paddingRight">2dp</item> </style> <style name="PlaybackControl" parent="@style/BasicButton"> diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 6321852f..8cccab93 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -4,6 +4,8 @@ <item name="offline_icon">@drawable/main_offline_light</item> <item name="media_button_backward">@drawable/media_backward_light</item> <item name="media_button_forward">@drawable/media_forward_light</item> + <item name="media_button_rewind">@drawable/media_rewind_light</item> + <item name="media_button_fastforward">@drawable/media_fastforward_light</item> <item name="media_button_pause">@drawable/media_pause_light</item> <item name="media_button_repeat_off">@drawable/media_repeat_off_light</item> <item name="media_button_repeat_single">@drawable/media_repeat_single_light</item> @@ -15,6 +17,8 @@ <item name="actionbar_pause">@drawable/media_pause_dark</item> <item name="actionbar_start">@drawable/media_start_dark</item> <item name="actionbar_stop">@drawable/media_stop_dark</item> + <item name="actionbar_rewind">@drawable/media_rewind_dark</item> + <item name="actionbar_fastforward">@drawable/media_fastforward_dark</item> <item name="chat_send">@drawable/ic_menu_chat_send_light</item> <item name="add">@drawable/ic_action_add_dark</item> <item name="download_none">@drawable/download_none_light</item> @@ -38,11 +42,14 @@ <item name="rating_good">@drawable/ic_action_rating_good_light</item> <item name="radio">@drawable/ic_menu_radio_dark</item> <item name="star_outline">@drawable/ic_toggle_star_outline_light</item> + <item name="download">@drawable/ic_menu_download_dark</item> + <item name="playback_speed">@drawable/ic_action_playback_speed_light</item> <item name="drawerHome">@drawable/main_offline_light</item> <item name="drawerLibrary">@drawable/ic_menu_library_light</item> <item name="drawerPlaylists">@drawable/ic_menu_playlist_light</item> <item name="drawerPodcasts">@drawable/ic_menu_podcast_light</item> <item name="drawerBookmarks">@drawable/ic_menu_bookmark_light</item> + <item name="drawerInternetRadioStations">@drawable/ic_menu_radio_light</item> <item name="drawerShares">@drawable/ic_menu_share_light</item> <item name="drawerChat">@drawable/ic_menu_chat_light</item> <item name="drawerAdmin">@drawable/ic_menu_admin_light</item> @@ -62,11 +69,15 @@ <item name="drawerSubtitleStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle.Inverse</item> <item name="windowActionModeOverlay">true</item> <item name="actionModeBackground">?attr/colorPrimary</item> + <item name="cardBackgroundDrawable">@drawable/card_rounded_corners_light</item> + <item name="drawerHeaderBackground">@drawable/drawer_header_light</item> </style> <style name="Theme.DSub.Dark.Base" parent="@style/Theme.AppCompat"> <item name="offline_icon">@drawable/main_offline_dark</item> <item name="media_button_backward">@drawable/media_backward_dark</item> <item name="media_button_forward">@drawable/media_forward_dark</item> + <item name="media_button_rewind">@drawable/media_rewind_dark</item> + <item name="media_button_fastforward">@drawable/media_fastforward_dark</item> <item name="media_button_pause">@drawable/media_pause_dark</item> <item name="media_button_repeat_off">@drawable/media_repeat_off_dark</item> <item name="media_button_repeat_single">@drawable/media_repeat_single_dark</item> @@ -78,6 +89,8 @@ <item name="actionbar_pause">@drawable/media_pause_dark</item> <item name="actionbar_start">@drawable/media_start_dark</item> <item name="actionbar_stop">@drawable/media_stop_dark</item> + <item name="actionbar_rewind">@drawable/media_rewind_dark</item> + <item name="actionbar_fastforward">@drawable/media_fastforward_dark</item> <item name="chat_send">@drawable/ic_menu_chat_send_dark</item> <item name="add">@drawable/ic_action_add_dark</item> <item name="download_none">@drawable/download_none_dark</item> @@ -101,11 +114,14 @@ <item name="rating_good">@drawable/ic_action_rating_good_dark</item> <item name="radio">@drawable/ic_menu_radio_dark</item> <item name="star_outline">@drawable/ic_toggle_star_outline_dark</item> + <item name="download">@drawable/ic_menu_download_dark</item> + <item name="playback_speed">@drawable/ic_action_playback_speed_dark</item> <item name="drawerHome">@drawable/main_offline_dark</item> <item name="drawerLibrary">@drawable/ic_menu_library_dark</item> <item name="drawerPlaylists">@drawable/ic_menu_playlist_dark</item> <item name="drawerPodcasts">@drawable/ic_menu_podcast_dark</item> <item name="drawerBookmarks">@drawable/ic_menu_bookmark_dark</item> + <item name="drawerInternetRadioStations">@drawable/ic_menu_radio_dark</item> <item name="drawerShares">@drawable/ic_menu_share_dark</item> <item name="drawerChat">@drawable/ic_menu_chat_dark</item> <item name="drawerAdmin">@drawable/ic_menu_admin_dark</item> @@ -124,20 +140,29 @@ <item name="drawerSubtitleStyle">@style/TextAppearance.AppCompat.Widget.ActionBar.Subtitle</item> <item name="windowActionModeOverlay">true</item> <item name="actionModeBackground">?attr/colorPrimary</item> + <item name="cardBackgroundDrawable">@drawable/card_rounded_corners_dark</item> + <item name="drawerHeaderBackground">@drawable/drawer_header_dark</item> </style> <style name="Theme.DSub.Light" parent="Theme.DSub.Light.Base"> </style> <style name="Theme.DSub.Dark" parent="Theme.DSub.Dark.Base"> </style> - <style name="Theme.DSub.Black" parent="Theme.DSub.Dark"> + <style name="Theme.DSub.Black.Base" parent="Theme.DSub.Dark.Base"> + <item name="cardBackgroundDrawable">@drawable/card_rounded_corners_black</item> <item name="android:windowBackground">@android:color/black</item> </style> - <style name="Theme.DSub.Holo" parent="Theme.DSub.Dark"> + <style name="Theme.DSub.Black" parent="Theme.DSub.Black.Base"> + </style> + <style name="Theme.DSub.Holo.Base" parent="Theme.DSub.Dark.Base"> <item name="android:windowBackground">@drawable/background</item> <item name="colorPrimary">@color/holoPrimary</item> <item name="colorPrimaryDark">@color/holoPrimaryDark</item> <item name="colorAccent">@color/holoAccent</item> <item name="actionbarBackgroundColor">@color/holoPrimary</item> + <item name="drawerHeaderBackground">@drawable/drawer_header_holo</item> + <item name="cardBackgroundDrawable">@drawable/card_rounded_corners_black</item> + </style> + <style name="Theme.DSub.Holo" parent="Theme.DSub.Holo.Base"> </style> <style name="Theme.DSub.Light.No_Actionbar" parent="Theme.DSub.Light"> @@ -170,6 +195,8 @@ <item name="actionbar_pause">@drawable/media_pause_light</item> <item name="actionbar_start">@drawable/media_start_light</item> <item name="actionbar_stop">@drawable/media_stop_light</item> + <item name="actionbar_rewind">@drawable/media_rewind_light</item> + <item name="actionbar_fastforward">@drawable/media_fastforward_light</item> <item name="add">@drawable/ic_action_add_light</item> <item name="shuffle">@drawable/ic_menu_shuffle_light</item> <item name="refresh">@drawable/ic_menu_refresh_light</item> @@ -179,6 +206,7 @@ <item name="add_person">@drawable/ic_menu_add_person_light</item> <item name="password">@drawable/ic_menu_password_light</item> <item name="radio">@drawable/ic_menu_radio_light</item> + <item name="download">@drawable/ic_menu_download_light</item> <item name="actionModeBackground">@color/background_material_light</item> <item name="actionModeStyle">@style/LightActionMode</item> <item name="actionModeCloseButtonStyle">@style/DarkCloseButton</item> diff --git a/app/src/main/res/xml/changelog.xml b/app/src/main/res/xml/changelog.xml index 39fc7496..d31f6df6 100644 --- a/app/src/main/res/xml/changelog.xml +++ b/app/src/main/res/xml/changelog.xml @@ -1,5 +1,153 @@ <?xml version="1.0" encoding="utf-8"?> <changelog> + <release version="5.3.5" versioncode="195" releasedate="04/18/2016"> + <change>Add option to scan server for Subsonic 6.1+</change> + <change>Enhanced custom playback speed UI (thanks SilentViking)</change> + <change>Keep custom playback speed between songs (thanks SilentViking)</change> + <change>Auto: Browse full library while parked (thanks hufman)</change> + <change>Add bitrate option for 48kpbs</change> + <change>Only download playlist when setting to sync if on Wifi</change> + </release> + <release version="5.3.4" versioncode="193" releasedate="11/28/2016"> + <change>Added toggle for DLNA casting to fix battery issues some users are having on Android 7.0+</change> + <change>Fix rotating screen in offline mode</change> + </release> + <release version="5.3.3" versioncode="191" releasedate="11/9/2016"> + <change>Add support for Android 7's split screen UI</change> + <change>Fix for Android 7 not playing</change> + <change>Fix basic authentication for servers</change> + <change>Fix top track songs using different save file</change> + </release> + <release version="5.3.2" versioncode="190" releasedate="10/22/2016"> + <change>Add support for casting Internet Radio to ChromeCast/DLNA</change> + <change>Add support for Play Title by Artist from Google Search</change> + <change>Move to more modern connection framework</change> + <change>Use Google Play SSL</change> + <change>Show album instead of artist for Show all media</change> + <change>Ask for location permissions for Day/Night themes</change> + <change>Fix a change to the ChromeCast API</change> + <change>Fix Show all media sometimes failing</change> + </release> + <release version="5.3.1" versioncode="187" releasedate="10/4/2016"> + <change>Fix Internet Radio streams which point to playlists</change> + <change>Don't show playback speed button below Android 6.0</change> + </release> + <release version="5.3" versioncode="186" releasedate="9/23/2016"> + <change>Listen to Radio Internet Stations</change> + <change>Automatic Day/Night theme</change> + <change>Android 6.0 runtime permissions</change> + <change>Custom variable playback speed</change> + <change>Add Play Now for songs when click action is add to queue</change> + <change>More secure connections with tokens (Subsonic 6+)</change> + <change>Auto skip uncached songs when no network</change> + <change>Shrink install size</change> + <change>Fix DLNA casting on Android 7.0+</change> + </release> + <release version="5.2.2" versioncode="184" releasedate="8/30/2016"> + <change>Fix lagging in landscape view on the Now Playing screen</change> + </release> + <release version="5.2.1" versioncode="183" releasedate="8/24/2016"> + <change>Add option for different actions when pressing a song</change> + <change>Fix some N release issues</change> + <change>Fix grid alignment for some albums</change> + </release> + <release version="5.2" versioncode="182" releasedate="7/27/2016"> + <change>Variable Playback Speed (Android 6.0+)</change> + <change>Show album instead of artist on Top Tracks</change> + <change>Fix search/comments with ' not working</change> + <change>Fix double press to skip from some headsets</change> + <change>Fix newer versions of Madsonic's Artist Radio</change> + <change>Fix no SSID using local network address on all WiFi connections</change> + <change>Fix rotation/sleep while EQ was visible</change> + <change>Fix being able to add albums to playlists</change> + <change>Fix cast dialog in landscape</change> + </release> + <release version="5.1.9" versioncode="181" releasedate="6/13/2016"> + <change>Fix First level artists option</change> + <change>Fix some artist menu items missing</change> + </release> + <release version="5.1.8" versioncode="179" releasedate="6/9/2016"> + <change>Improved Search Bar</change> + <change>Display songs in root folder</change> + <change>Heads Up Setting: Only when out of app</change> + <change>Speed up resuming app from notifications/widgets</change> + <change>Bluetooth: Double click play/pause button to skip to next some</change> + <change>Auto: Previous/Next rewind/fast forward on Podcasts/Audio Books</change> + <change>Fix playlist not overwriting when resumed from bookmark</change> + <change>Fix some bluetooth devices sending next/previous multiple times</change> + <change>Fix reverting to stock Subsonic after using Madsonic 6+ servers</change> + <change>Fix Podcast list cache not working with no internet</change> + </release> + <release version="5.1.7" versioncode="177" releasedate="4/22/2016"> + <change>Audio Books/Podcasts: Replace back/forward with rewind/fast forward buttons</change> + <change>Expandable Search Results</change> + <change>Add option to cache while casting</change> + <change>Add optional Heads Up Notifications (Lollipop+)</change> + <change>Clicking bookmarked song plays entire album from bookmarked position</change> + <change>Auto: Remove podcast/album limit now that Google removed limit</change> + <change>Fix tall album art running into controls</change> + <change>Fix Show Artist not being an option when browsing By Tags</change> + <change>Fix 1-star song background on darker themes</change> + <change>Fix Bluetooth multiple skips</change> + </release> + <release version="5.1.6" versioncode="175" releasedate="3/16/2016"> + <change>Podcasts/Audio Books: Show listened indicator</change> + <change>Podcasts/Audio Books: Improve what is considered fully played</change> + <change>Improved Artist sorting to closer match Web GUI</change> + <change>Show Artist/Album from Search and Album Lists</change> + <change>Videos: ability to star</change> + <change>Admin: Show/update Video Conversion role (Subsonic 6.0+)</change> + <change>Stop background sync if lose Wifi</change> + <change>Fix upsampling mp3s when cache rate is set to unlimited</change> + <change>Fix "Failed to create artist radio" error</change> + <change>Fix rare issue causing arrow to get stuck</change> + <change>Fix rare issue with background download getting stuck</change> + </release> + <release version="5.1.5" versioncode="173" releasedate="2/15/2016"> + <change>Toggle for Batch Mode on Now Playing</change> + <change>Admin tab: view/update music folders (Subsonic 5.2+)</change> + <change>Tag Browsing: can specify Music Folder (Subsonic 6.0+)</change> + <change>Show shuffle/radio mode in title bar</change> + <change>Madsonic only: Songs lists on Home tab</change> + <change>Clicking songs adds songs before it as well</change> + <change>Similar Artists: show missing artists below main list</change> + <change>Improve offline search (thanks fxthomas)</change> + <change>Improve podcast date formatting</change> + <change>Increase max sleep timer to 1 hour</change> + <change>Cast: added setting to disable DLNA gapless playback</change> + <change>Cast: added setting to stream original source files</change> + <change>Long press details dialogs to copy information</change> + <change>Android Auto improvements</change> + <change>Top Tracks: display #</change> + <change>Require current password when changing password</change> + <change>Improved Share Details dialog</change> + <change>Sort Music Folders alphabetically</change> + <change>Fix repeating same song if multiples copies in play queue</change> + <change>Fix freeze on Play x from Google Now</change> + <change>Fix Show Artist/Album back behavior</change> + <change>Minor Chromecast fixes</change> + </release> + <release version="5.1.4" versioncode="172" releasedate="1/17/2016"> + <change>Minor theme improvements</change> + </release> + <release version="5.1.3" versioncode="169" releasedate="1/11/2016"> + <change>Display albums in cards</change> + <change>Improve ActionBar dropdown</change> + <change>Add Portuguese and Dutch translations</change> + <change>Add batch Star/Unstar</change> + <change>Add quick Internal/External buttons when changing Cache Location</change> + <change>Auto add bookmarks on pause for Podcasts/Audio Books</change> + <change>Android Auto: Add Podcasts, Album Lists, and Bookmarks tabs</change> + <change>Add more spacing between Track # and Title</change> + <change>Go directly to synced Playlist/Podcast on Sync notification</change> + <change>Themed drawer header images</change> + <change>Update Cover Art in background refresh</change> + <change>Fix Repeat All in Jukebox mode</change> + <change>Fix rotating re-opening Now Playing from widget</change> + <change>Fix some DLNA issues</change> + <change>Fix Black/Holo themes not having drawer behind notification panel</change> + <change>Fix songs in Album Lists for Madsonic</change> + </release> <release version="5.1.2" versioncode="167" releasedate="12/17/2015"> <change>Keep track of played songs locally</change> <change>Improved DLNA/Chromecast casting</change> diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml index ac247c8f..a067130a 100644 --- a/app/src/main/res/xml/settings.xml +++ b/app/src/main/res/xml/settings.xml @@ -31,4 +31,9 @@ android:title="@string/settings.playback_title" android:key="playback"> </PreferenceScreen> + + <PreferenceScreen + android:title="@string/settings.casting" + android:key="cast"> + </PreferenceScreen> </PreferenceScreen> diff --git a/app/src/main/res/xml/settings_appearance.xml b/app/src/main/res/xml/settings_appearance.xml index 5e355526..530d92a1 100644 --- a/app/src/main/res/xml/settings_appearance.xml +++ b/app/src/main/res/xml/settings_appearance.xml @@ -53,14 +53,6 @@ android:key="renameDuplicates" android:defaultValue="true"/> - <ListPreference - android:title="@string/settings.open_to_tab" - android:summary="@string/settings.open_to_tab_summary" - android:key="openToTab" - android:entryValues="@array/defaultDrawerItemsDescriptions" - android:entries="@array/defaultDrawerItems" - android:defaultValue="Home"/> - <CheckBoxPreference android:title="@string/settings.disable_exit_prompt" android:summary="@string/settings.disable_exit_prompt_summary" diff --git a/app/src/main/res/xml/settings_cache.xml b/app/src/main/res/xml/settings_cache.xml index bb5710b2..248572ca 100644 --- a/app/src/main/res/xml/settings_cache.xml +++ b/app/src/main/res/xml/settings_cache.xml @@ -57,7 +57,7 @@ android:defaultValue="2000" android:digits="0123456789"/> - <EditTextPreference + <github.daneren2005.dsub.view.CacheLocationPreference android:title="@string/settings.cache_location" android:key="cacheLocation"/> diff --git a/app/src/main/res/xml/settings_cast.xml b/app/src/main/res/xml/settings_cast.xml new file mode 100644 index 00000000..78bafdd4 --- /dev/null +++ b/app/src/main/res/xml/settings_cast.xml @@ -0,0 +1,41 @@ +<?xml version="1.0" encoding="utf-8"?> +<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" + android:title="@string/settings.casting"> + <PreferenceCategory + android:title="@string/settings.casting"> + + <CheckBoxPreference + android:title="@string/settings.casting_proxy" + android:summary="@string/settings.casting_proxy_summary" + android:key="castProxy" + android:defaultValue="false"/> + + <CheckBoxPreference + android:title="@string/settings.gapless_playback" + android:summary="@string/settings.gapless_playback_summary" + android:key="castingGaplessPlayback" + android:defaultValue="true"/> + + <CheckBoxPreference + android:title="@string/settings.casting_stream_original" + android:summary="@string/settings.casting_stream_original_summary" + android:key="castStreamOriginal" + android:defaultValue="true"/> + + <CheckBoxPreference + android:title="@string/settings.casting_cache" + android:summary="@string/settings.casting_cache_summary" + android:key="castCache" + android:defaultValue="false"/> + </PreferenceCategory> + + <PreferenceCategory + android:title="@string/settings.other_title"> + + <CheckBoxPreference + android:title="@string/settings.casting.dlna_casting_enabled" + android:summary="@string/settings.casting.dlna_casting_enabled.summary" + android:key="dlnaCastingEnabled" + android:defaultValue="true"/> + </PreferenceCategory> +</PreferenceScreen>
\ No newline at end of file diff --git a/app/src/main/res/xml/settings_drawer.xml b/app/src/main/res/xml/settings_drawer.xml index a874881a..f89fb990 100644 --- a/app/src/main/res/xml/settings_drawer.xml +++ b/app/src/main/res/xml/settings_drawer.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:myns="http://schemas.android.com/apk/res/github.daneren2005.dsub" + xmlns:myns="http://schemas.android.com/apk/res-auto" android:title="@string/settings.drawer_items_title"> <PreferenceCategory @@ -19,6 +19,12 @@ android:defaultValue="true"/> <CheckBoxPreference + android:title="@string/settings.internet_radio_enabled" + android:summary="@string/settings.internet_radio_enabled_summary" + android:key="internetRadioEnabled" + android:defaultValue="true"/> + + <CheckBoxPreference android:title="@string/settings.shares_enabled" android:summary="@string/settings.shares_enabled_summary" android:key="sharedEnabled" @@ -38,7 +44,15 @@ </PreferenceCategory> <PreferenceCategory - android:title="@string/button_bar.chat"> + android:title="@string/settings.other_title"> + + <ListPreference + android:title="@string/settings.open_to_tab" + android:summary="@string/settings.open_to_tab_summary" + android:key="openToTab" + android:entryValues="@array/defaultDrawerItemsDescriptions" + android:entries="@array/defaultDrawerItems" + android:defaultValue="Home"/> <github.daneren2005.dsub.view.SeekBarPreference android:title="@string/settings.chat_refresh" diff --git a/app/src/main/res/xml/settings_playback.xml b/app/src/main/res/xml/settings_playback.xml index 3c505b6e..da31d071 100644 --- a/app/src/main/res/xml/settings_playback.xml +++ b/app/src/main/res/xml/settings_playback.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:myns="http://schemas.android.com/apk/res/github.daneren2005.dsub" + xmlns:myns="http://schemas.android.com/apk/res-auto" android:title="@string/settings.playback_title"> <PreferenceCategory @@ -41,10 +41,17 @@ android:defaultValue="false"/> <CheckBoxPreference - android:title="@string/settings.play_now_after" - android:summary="@string/settings.play_now_after_summary" - android:key="playNowAfter" - android:defaultValue="true"/> + android:title="@string/settings.heads_up_notification" + android:summary="@string/settings.heads_up_notification_summary" + android:key="headsUpNotification" + android:defaultValue="false"/> + + <ListPreference + android:title="@string/settings.song_press_action" + android:key="songPressAction" + android:defaultValue="all" + android:entryValues="@array/songPressActionValues" + android:entries="@array/songPressActionNames"/> </PreferenceCategory> <PreferenceCategory @@ -59,16 +66,6 @@ </PreferenceCategory> <PreferenceCategory - android:title="@string/settings.casting"> - - <CheckBoxPreference - android:title="@string/settings.casting_proxy" - android:summary="@string/settings.casting_proxy_summary" - android:key="castProxy" - android:defaultValue="false"/> - </PreferenceCategory> - - <PreferenceCategory android:title="@string/settings.replay_gain"> <CheckBoxPreference |
