Merge remote-tracking branch 'upstream/dev' into videoDetailscrollFix
This commit is contained in:
commit
7b5ae64488
9 changed files with 39 additions and 8 deletions
|
|
@ -9,6 +9,7 @@
|
|||
android:id="@+id/drawer_header_action_button"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:contentDescription="@string/drawer_header_description"
|
||||
android:background="?android:attr/selectableItemBackground" />
|
||||
|
||||
<ImageView
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
<string name="settings_category_video_audio_title">Video & Audio</string>
|
||||
<string name="content_language_title">Bevorzugte Sprache des Inhalts</string>
|
||||
<string name="list_thumbnail_view_description">Video-Vorschaubild</string>
|
||||
<string name="detail_thumbnail_view_description">Video-Vorschaubild</string>
|
||||
<string name="detail_thumbnail_view_description">Video abspielen, dauer</string>
|
||||
<string name="detail_uploader_thumbnail_view_description">Nutzerbild</string>
|
||||
<string name="detail_dislikes_img_view_description">Gefällt nicht</string>
|
||||
<string name="detail_likes_img_view_description">Gefällt</string>
|
||||
|
|
|
|||
|
|
@ -228,7 +228,7 @@
|
|||
<string name="error_details_headline">Details:</string>
|
||||
<!-- Content descriptions (for better accessibility) -->
|
||||
<string name="list_thumbnail_view_description">Video preview thumbnail</string>
|
||||
<string name="detail_thumbnail_view_description">Video preview thumbnail</string>
|
||||
<string name="detail_thumbnail_view_description">Play video, duration:</string>
|
||||
<string name="detail_uploader_thumbnail_view_description">Uploader\'s avatar thumbnail</string>
|
||||
<string name="detail_likes_img_view_description">Likes</string>
|
||||
<string name="detail_dislikes_img_view_description">Dislikes</string>
|
||||
|
|
@ -250,6 +250,7 @@
|
|||
<string name="short_thousand">K</string>
|
||||
<string name="short_million">M</string>
|
||||
<string name="short_billion">B</string>
|
||||
<string name="drawer_header_description">Toggle service, currently selected:</string>
|
||||
<!--Zero don't get selected (in some languages) as it is not a "special case" for android-->
|
||||
<string name="no_subscribers">No subscribers</string>
|
||||
<plurals name="subscribers">
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue