diff --git a/app/build.gradle b/app/build.gradle
index e12e7de5..e35214c4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -38,6 +38,9 @@ android {
                 properties.load(propFile.newDataInputStream())
 
                 keyPassword properties.getProperty('keyPassword')
+            } else {
+                println 'keystore.properties not found'
+                keyPassword null
             }
         }
     }
@@ -47,8 +50,8 @@ android {
         applicationId "com.kabouzeid.gramophone"
         minSdkVersion 16
         targetSdkVersion 22
-        versionCode 55
-        versionName "0.9.39b dev-1"
+        versionCode 56
+        versionName "0.9.40b dev-1"
     }
     buildTypes {
         release {
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index be23f3ed..5526aecc 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -104,6 +104,7 @@
     <string name="pref_title_general_theme">Generelles Design</string>
     <string name="pref_header_audio">Audio</string>
     <string name="pref_header_general">Generell</string>
+    <string name="pref_header_images">Bilder</string>
     <string name="pref_header_lockscreen">Sperrbildschirm</string>
     <string name="pref_summary_colored_navigation_bar">In welchen Ansichten die Navigationsleiste gefärbt werden soll</string>
     <string name="pref_title_navigation_bar">Farbige Navigationsleiste</string>
@@ -117,6 +118,7 @@
     <string name="pref_title_colored_album_footers">Farbige Balken unter den Alben</string>
     <string name="pref_title_album_art_on_lockscreen">Album Cover im Sperrbildschirm anzeigen</string>
     <string name="pref_title_colored_notification">Farbige Benachrichtigung</string>
+    <string name="pref_title_ignore_media_store_artwork">Media Store Cover ignorieren</string>
     <string name="pref_title_gapless_playback">Lückenlose Wiedergabe</string>
     <string name="pref_title_force_square_album_art">Quadratisches Album Cover erzwingen</string>
     <string name="pref_title_opaque_toolbar_now_playing">Undurchsichtige Toolbar</string>
@@ -160,6 +162,7 @@
     <string name="pref_summary_larger_title_box_now_playing">Die Bar unter dem Album Cover wo sich der Titel und Interpret befinden ist höher.</string>
     <string name="pref_summary_alternative_progress_slider_now_playing">Benutzt einen Balken als Progress Slider anstatt dem normalen Progress Slider.</string>
     <string name="pref_summary_playback_controller_card_now_playing">Zeigt eine Karte hinter der Wiedergabesteuerung</string>
+    <string name="pref_summary_ignore_media_store_artwork">Der Media Store wird umgangen, was die Album Cover Qualität verbessern kann aber die Ladezeit beeinträchtigt. Nur aktivieren falls Probleme mit niedrig aufgelösten Album Covern auftreten</string>
     <string name="could_not_download_album_cover">"Es konnte kein passendes Album Cover heruntergeladen werden."</string>
     <string name="search_hint">Durchsuche deine Mediathek</string>
     <string name="rescanning_media">Medien neu scannen...</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 8ac791db..04bcc164 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -171,4 +171,9 @@
     <string name="download_from_last_fm">Télécharger depuis Last.fm</string>
     <string name="pick_from_local_storage">Sélectionner sur l\'appareil</string>
     <string name="web_search">Recherche Internet</string>
+    <string name="action_sleep_timer">Minuteur sommeil</string>
+    <string name="action_set">Régler</string>
+    <string name="cancel_current_timer">Annuler le minuteur actuel</string>
+    <string name="sleep_timer_canceled">Le minuteur actuel a été annulé</string>
+    <string name="sleep_timer_set">Arrêt de la musique dans %d minutes</string>
 </resources>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 4ae5126b..2cb9730e 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -4,7 +4,7 @@
     <string name="currently_listening_to_x_by_x">Trenutno slušate %1$s od %2$s</string>
     <string name="the_audio_file">Audio datoteka</string>
     <string name="do_you_want_to_set_x_as_ringtone">Želite li postaviti %1$s kao zvuk zvona?</string>
-    <string name="x_has_been_set_as_ringtone">Postavili ste %1$s kao zvuk zvona.</string>
+    <string name="x_has_been_set_as_ringtone">Postavili ste %1$s kao zvuk zvona</string>
     <string name="action_set_as_ringtone">Postavi kao zvuk zvona</string>
     <string name="action_share">Podijeli</string>
     <string name="action_settings">"Postavke"</string>
@@ -28,8 +28,8 @@
     <string name="songs">Pjesme</string>
     <string name="playlists">Popisi pjesama</string>
     <string name="nothing_playing">Ništa se ne reproducira</string>
-    <string name="unplayable_file">Došlo je do greške prilikom pokušaja reproduciranja ove pjesme.</string>
-    <string name="biography_unavailable">Nismo mogli pronaći biografiju ovog izvođača.</string>
+    <string name="unplayable_file">Došlo je do greške prilikom pokušaja reproduciranja ove pjesme</string>
+    <string name="biography_unavailable">Nismo mogli pronaći biografiju ovog izvođača</string>
     <string name="biography">Biografija</string>
     <string name="audio_focus_denied">Nema audio fokusa.</string>
     <string name="tag_editor">Uređivač tagova</string>
@@ -40,7 +40,7 @@
     <string name="year">Godina</string>
     <string name="track">Redni broj</string>
     <string name="track_hint">"Redni broj (2 za pjesmu broj 2 ili 3004 za CD3 pjesmu broj 4)"</string>
-    <string name="album_or_artist_empty">Polje za naziv ili izvođača albuma je prazno.</string>
+    <string name="album_or_artist_empty">Polje za naziv ili izvođača albuma je prazno</string>
     <string name="writing_file_number">Spremam datoteku</string>
     <string name="saving_changes">Spremam promjene</string>
     <string name="label_details">Detalji</string>
@@ -62,13 +62,13 @@
     <string name="updated_artist_image">Ažurirana slika izvođača.</string>
     <string name="could_not_update_artist_image">Nemoguće ažurirati sliku izvođača.</string>
     <string name="updating">Ažuriram</string>
-    <string name="added_title_to_playing_queue">"Pjesma dodana u red čekanja."</string>
-    <string name="added_x_titles_to_playing_queue">Dodano %1$d pjesama u red čekanja.</string>
+    <string name="added_title_to_playing_queue">"Pjesma dodana u red čekanja"</string>
+    <string name="added_x_titles_to_playing_queue">Dodano %1$d pjesama u red čekanja</string>
     <string name="action_remove_from_playlist">Ukloni s popisa pjesama</string>
     <string name="new_playlist_action">Novi popis pjesama</string>
     <string name="action_grid_columns">Stupci rešetke</string>
     <string name="action_grid_columns_land">Stupci rešetke (položeno)</string>
-    <string name="inserted_x_songs_into_playlist">Stavljeno %1$d pjesama na popis.</string>
+    <string name="inserted_x_songs_into_playlist">Stavljeno %1$d pjesama na popis</string>
     <string name="created_playlist_x">Stvoren popis pjesama %1$s</string>
     <string name="deleted_playlist_x">Obrisan popis pjesama %1$s</string>
     <string name="deleted_x_songs">Obrisano %1$d pjesama</string>
@@ -90,7 +90,7 @@
     <string name="clear_playlist_title">Isprazni popis pjesama</string>
     <string name="add_playlist_title">"Dodaj na popis pjesama"</string>
     <string name="new_playlist_title">Novi popis pjesama</string>
-    <string name="delete_warning">"Upozorenje: Ovaj postupak nije moguće poništiti."</string>
+    <string name="delete_warning">"Upozorenje: Ovaj postupak nije moguće poništiti"</string>
     <string name="action_shuffle_all">Nasumična reprodukcija svega</string>
     <string name="action_shuffle_album">Nasumična reprodukcija albuma</string>
     <string name="action_shuffle_artist">Nasumična reprodukcija izvođača</string>
@@ -171,4 +171,9 @@
     <string name="download_from_last_fm">Skini s lokacije Last.fm</string>
     <string name="pick_from_local_storage">Odaberi s uređaja</string>
     <string name="web_search">Web pretraga</string>
+    <string name="action_sleep_timer">Tajmer za spavanje</string>
+    <string name="action_set">Postavi</string>
+    <string name="cancel_current_timer">Otkaži trenutni tajmer</string>
+    <string name="sleep_timer_canceled">Tajmer za spavanje je otkazan</string>
+    <string name="sleep_timer_set">Tajmer za spavanje namješten je za %d min od sada</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 3080a409..2e45f3fd 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -172,4 +172,8 @@
     <string name="pick_from_local_storage">Scegli da archiviazione locale</string>
     <string name="web_search">Cerca sul web</string>
     <string name="action_sleep_timer">Timer di spegnimento</string>
+    <string name="action_set">Imposta</string>
+    <string name="cancel_current_timer">Annulla timer attuale</string>
+    <string name="sleep_timer_canceled">Il timer di spegnimento è stato annullato</string>
+    <string name="sleep_timer_set">Timer di spegnimento impostato a %d minuti da adesso</string>
 </resources>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 27231048..4ac5bbc6 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -172,4 +172,8 @@
     <string name="pick_from_local_storage">ローカルストレージから選択</string>
     <string name="web_search">ウェブで検索</string>
     <string name="action_sleep_timer">スリープタイマー</string>
+    <string name="action_set">セット</string>
+    <string name="cancel_current_timer">スリープタイマーを解除</string>
+    <string name="sleep_timer_canceled">スリープタイマーは解除されました</string>
+    <string name="sleep_timer_set">%d分後にスリープタイマーをセットしました</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 99e864c8..9f5d3ea6 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -28,8 +28,8 @@
     <string name="songs">Utwory</string>
     <string name="playlists">Listy odtwarzania</string>
     <string name="nothing_playing">Nic nie gra</string>
-    <string name="unplayable_file">Niestety - wystąpił błąd przy próbie odtworzenia tego utworu</string>
-    <string name="biography_unavailable">Niestety nie byliśmy w stanie znaleźć pasującej biografii dla tego wykonawcy</string>
+    <string name="unplayable_file">Wystąpił błąd przy próbie odtworzenia tego utworu</string>
+    <string name="biography_unavailable">Nie znaleziono pasującej biografii dla tego wykonawcy</string>
     <string name="biography">Biografia</string>
     <string name="audio_focus_denied">Brak ostrości dźwięku</string>
     <string name="tag_editor">Edytor tagów</string>
@@ -40,7 +40,7 @@
     <string name="year">Rok</string>
     <string name="track">Numer utworu</string>
     <string name="track_hint">"Numer utworu (2 dla utworu 2 lub 3004 dla CD3 utworu 4)"</string>
-    <string name="album_or_artist_empty">Pole tekstowe nazwy albumu lub wykonawcy jest puste.</string>
+    <string name="album_or_artist_empty">Pole tekstowe nazwy albumu lub wykonawcy jest puste</string>
     <string name="writing_file_number">Zapisywanie pliku</string>
     <string name="saving_changes">Zapisywanie zmian...</string>
     <string name="label_details">Szczegóły</string>
@@ -172,4 +172,8 @@
     <string name="pick_from_local_storage">Wybierz z pamięci lokalnej</string>
     <string name="web_search">Wyszukaj w sieci</string>
     <string name="action_sleep_timer">Wyłącznik czasowy</string>
+    <string name="action_set">Ustaw</string>
+    <string name="cancel_current_timer">Anuluj aktualny wyłącznik czasowy</string>
+    <string name="sleep_timer_canceled">Wyłącznik czasowy został anulowany</string>
+    <string name="sleep_timer_set">Wyłącznik czasowy ustawiony na %d minut od teraz</string>
 </resources>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index a18db511..ced716cb 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -104,6 +104,7 @@
     <string name="pref_title_general_theme">Tema geral</string>
     <string name="pref_header_audio">Áudio</string>
     <string name="pref_header_general">Geral</string>
+    <string name="pref_header_images">Imagens</string>
     <string name="pref_header_lockscreen">Bloqueio de tela</string>
     <string name="pref_summary_colored_navigation_bar">Definir onde a barra de navegação deve ser colorida.</string>
     <string name="pref_title_navigation_bar">Barra de navegação colorida</string>
@@ -117,6 +118,7 @@
     <string name="pref_title_colored_album_footers">Rodapés de álbuns coloridos</string>
     <string name="pref_title_album_art_on_lockscreen">Imagem do álbum no bloqueio de tela</string>
     <string name="pref_title_colored_notification">Notificação colorida</string>
+    <string name="pref_title_ignore_media_store_artwork">Ignorar artwork Media Store</string>
     <string name="pref_title_gapless_playback">Reprodução continua</string>
     <string name="pref_title_force_square_album_art">Forçar a capa do álbum quadrada</string>
     <string name="pref_title_opaque_toolbar_now_playing">Barra de ações opaca</string>
@@ -160,6 +162,7 @@
     <string name="pref_summary_larger_title_box_now_playing">A caixa embaixo da capa do álbum onde o titulo da musica e o artista são mostrados é mais largo na sua altura.</string>
     <string name="pref_summary_alternative_progress_slider_now_playing">Usa uma barra de progresso que não cobre a capa do álbum substituindo a barra padrão.</string>
     <string name="pref_summary_playback_controller_card_now_playing">Mostra um cartão abaixo dos controles de reprodução (tocar/pausar etc.)</string>
+    <string name="pref_summary_ignore_media_store_artwork">O Android Media Store armazena em cache sua capa do álbum embutido, mas em alguns dispositivos que parece para armazená-lo em uma resolução baixa. Ativar essa vai ignorar o Media Store, que pode aumentar a qualidade do álbum, mas faz com que tempos imagem de carregamento lento.</string>
     <string name="could_not_download_album_cover">"Não foi possível baixar uma capa do álbum correspondente."</string>
     <string name="search_hint">Pesquisar na sua biblioteca...</string>
     <string name="rescanning_media">Verificando mídia novamente...</string>
@@ -171,4 +174,9 @@
     <string name="download_from_last_fm">Baixar do last.fm</string>
     <string name="pick_from_local_storage">Escolher do armazenamento local</string>
     <string name="web_search">Procurar na web</string>
+    <string name="action_sleep_timer">Temporizador</string>
+    <string name="action_set">Definir</string>
+    <string name="cancel_current_timer">Cancelar temporizador atual</string>
+    <string name="sleep_timer_canceled">Temporizador foi cancelado</string>
+    <string name="sleep_timer_set">Temporizador definido para %d minutos a partir de agora</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 6d95d8cb..63b03625 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -172,4 +172,8 @@
     <string name="pick_from_local_storage">从本地储存中选取</string>
     <string name="web_search">在网络上搜索</string>
     <string name="action_sleep_timer">睡眠定时器</string>
+    <string name="action_set">设置</string>
+    <string name="cancel_current_timer">取消当前计时器</string>
+    <string name="sleep_timer_canceled">睡眠定时器已被取消</string>
+    <string name="sleep_timer_set">音乐将于%d分钟后停止播放</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index fa42d5ed..ba384535 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -9,13 +9,19 @@
     <string name="action_share">分享</string>
     <string name="action_settings">"設定"</string>
     <string name="action_about">關於</string>
-    <string name="action_playing_queue">播放佇列</string>
+    <string name="action_now_playing">播放中</string>
+    <string name="action_clear_playlist">清除音樂清單</string>
+    <string name="action_playing_queue">播放列表</string>
+    <string name="action_add_to_favorites">加到最愛</string>
+    <string name="action_remove_from_favorites">從最愛移除</string>
     <string name="action_search">搜尋</string>
     <string name="action_play_next">稍後播放</string>
+    <string name="action_play">播放</string>
     <string name="action_add_to_playing_queue">加入佇列</string>
     <string name="action_remove_from_playing_queue">從播放佇列移除</string>
     <string name="action_add_to_playlist">加入音樂清單</string>
     <string name="action_tag_editor">編輯音樂標籤</string>
+    <string name="action_delete_from_device">從裝置中刪除</string>
     <string name="action_details">詳細資訊</string>
     <string name="albums">專輯</string>
     <string name="artists">歌手</string>
@@ -30,7 +36,7 @@
     <string name="album">專輯</string>
     <string name="artist">歌手</string>
     <string name="genre">音樂類型</string>
-    <string name="album_artist">專輯創作者</string>
+    <string name="album_artist">專輯歌手</string>
     <string name="year">年代</string>
     <string name="track">音軌</string>
     <string name="track_hint">"音軌（用2表示第2首歌&amp;3004表示CD3的第3首歌）"</string>
@@ -53,34 +59,51 @@
     <string name="credits_1">"Phonograph 是一個完全免費且遵從 Material Design 的音樂播放器，開發者為"</string>
     <string name="no_results">無搜尋結果</string>
     <string name="action_re_download_artist_image">更新歌手圖片</string>
+    <string name="could_not_update_artist_image">未能更新歌手圖片</string>
     <string name="updating">更新中…</string>
     <string name="added_title_to_playing_queue">"這歌曲已加入播放佇列"</string>
     <string name="added_x_titles_to_playing_queue">已增加%1$d首歌曲到播放佇列</string>
+    <string name="action_remove_from_playlist">從音樂清單移除</string>
     <string name="new_playlist_action">新增音樂清單</string>
     <string name="action_grid_columns">專輯網格列數</string>
     <string name="action_grid_columns_land">專輯網格列數（橫向）</string>
     <string name="inserted_x_songs_into_playlist">%1$d首歌曲已加入該音樂清單</string>
     <string name="created_playlist_x">已新增音樂清單%1$s</string>
     <string name="deleted_playlist_x">已刪除音樂清單%1$s</string>
+    <string name="deleted_x_songs">已刪除歌曲%1$d</string>
+    <string name="could_not_create_playlist">未能新增清單</string>
     <string name="delete_playlist_x"><![CDATA[你想刪除這個音樂清單： <b>%1$s</b>嗎？]]></string>
+    <string name="clear_playlist_x"><![CDATA[你真的想刪除這個音樂清單： <b>%1$s</b>嗎？這是不能取消的!]]></string>
     <string name="delete_x_playlists"><![CDATA[你想要刪除以下清單：<b>%1$d</b>嗎？]]></string>
     <string name="delete_song_x"><![CDATA[你想移除這首歌曲： <b>%1$s</b>嗎？]]></string>
     <string name="delete_x_songs"><![CDATA[你想要移除以下歌曲： <b>%1$d</b>嗎？]]></string>
+    <string name="remove_song_x_from_playlist"><![CDATA[你想要將這首歌曲<b>%1$s</b>從音樂清單移除嗎？     ]]></string>
+    <string name="remove_x_songs_from_playlist"><![CDATA[你想要將以下歌曲<b>%1$d</b>從音樂清單移除嗎？     ]]></string>
     <string name="delete_song_title">移除歌曲</string>
     <string name="delete_songs_title">移除歌曲</string>
+    <string name="remove_song_from_playlist_title">將歌曲從音樂清單移除</string>
+    <string name="remove_songs_from_playlist_title">將歌曲從音樂清單移除</string>
     <string name="rename_playlist_title">重新命名音樂清單</string>
     <string name="delete_playlist_title">刪除音樂清單</string>
     <string name="delete_playlists_title">刪除音樂清單</string>
+    <string name="clear_playlist_title">清除音樂清單</string>
     <string name="add_playlist_title">"加入音樂清單"</string>
     <string name="new_playlist_title">新增音樂清單</string>
     <string name="delete_warning">"警告：這個操作無法被撤銷！"</string>
+    <string name="action_shuffle_all">全部歌曲隨機播放</string>
+    <string name="action_shuffle_album">專輯隨機播放</string>
+    <string name="action_shuffle_artist">歌手隨機播放</string>
+    <string name="action_shuffle_playlist">隨機播放音樂清單</string>
     <string name="last_opened">上次開啟</string>
     <string name="light_theme_name">明亮</string>
     <string name="dark_theme_name">暗沉</string>
     <string name="equalizer">均衡器</string>
+    <string name="pref_header_colors">色彩</string>
+    <string name="pref_header_now_playing_screen">播放中之版面</string>
     <string name="pref_title_general_theme">主題</string>
     <string name="pref_header_audio">音訊</string>
     <string name="pref_header_general">通用</string>
+    <string name="pref_header_lockscreen">鎖屏</string>
     <string name="pref_summary_colored_navigation_bar">設定在哪些頁面啟用可變色的導航列</string>
     <string name="pref_title_navigation_bar">變色導航列</string>
     <string name="pref_title_set_default_start_page">起始頁</string>
@@ -89,31 +112,64 @@
     <string name="pref_title_colored_navigation_bar_current_playing">播放頁面</string>
     <string name="pref_title_colored_navigation_bar_playlists">音樂清單頁面</string>
     <string name="pref_title_colored_navigation_bar_tag_editor">編輯音樂標籤</string>
-    <string name="pref_title_colored_navigation_bar_other_screens">其他任何地方</string>
+    <string name="pref_title_colored_navigation_bar_other_screens">任何其他地方</string>
     <string name="pref_title_colored_album_footers">使用變色的專輯標籤</string>
+    <string name="pref_title_album_art_on_lockscreen">鎖屏中之專輯封面</string>
+    <string name="pref_title_colored_notification">使用變色的通知</string>
+    <string name="pref_title_gapless_playback">無縫重播</string>
     <string name="pref_title_force_square_album_art">強制使用正方形專輯封面</string>
     <string name="pref_title_opaque_toolbar_now_playing">正在播放介面使用不透明工具欄</string>
+    <string name="pref_title_opaque_statusbar_now_playing">使用不透明狀態欄</string>
+    <string name="pref_title_larger_title_box_now_playing">大標題框</string>
+    <string name="pref_title_alternative_progress_slider_now_playing">替代進度列</string>
+    <string name="pref_title_playback_controller_card_now_playing">播放控制器下顯示背景卡</string>
     <string name="no_equalizer">沒有找到均衡器</string>
     <string name="no_audio_ID">"沒有音訊ID，請播放並重試。"</string>
     <string name="navigation_drawer_open">打開側選單</string>
     <string name="navigation_drawer_close">"關閉側選單"</string>
     <string name="delete_action">刪除</string>
+    <string name="clear_action">清除</string>
+    <string name="remove_action">移除</string>
     <string name="rename_action">重新命名</string>
     <string name="create_action">創建</string>
+    <string name="x_selected">已選取%1$d</string>
     <string name="select">選取</string>
     <string name="default_str">預設</string>
     <string name="primary_color">主色調</string>
-    <string name="accent_color">重點色</string>
+    <string name="accent_color">重點色調</string>
     <string name="primary_color_desc">主色調預設為靛青色。</string>
-    <string name="accent_color_desc">重點色預設為粉紅色。</string>
+    <string name="accent_color_desc">重點色調預設為粉紅色。</string>
     <string name="update_image">更新圖片</string>
     <string name="playlist_empty_text">這個音樂清單是空的</string>
     <string name="no_playlists">無音樂清單</string>
+    <string name="no_albums">沒有專輯</string>
+    <string name="no_songs">沒有歌曲</string>
+    <string name="no_artists">沒有歌手</string>
+    <string name="empty">空的</string>
+    <string name="playlist_name_empty">音樂清單名稱</string>
     <string name="song">歌曲</string>
     <string name="pref_only_lollipop">"只適用於 Lollipop。"</string>
     <string name="pref_summary_colored_album_footers">"在專輯頁面中的專輯標籤會隨其封面顏色而改變。"</string>
+    <string name="pref_summary_album_art_on_lockscreen">專輯封面會於鎖屏顯示。你可能需要重新啟動電唱機以得到更改生效</string>
+    <string name="pref_summary_colored_notification">"通知會隨其封面顏色而改變。"</string>
+    <string name="pref_summary_gapless_playback">"消除了兩首歌曲之間的間隙。這可能會導致某些設備上出現重播問題。"</string>
     <string name="pref_summary_force_square_album_art">於正在播放介面中強制使用正方形專輯封面。</string>
     <string name="pref_summary_opaque_toolbar_now_playing">於正在播放介面中使用不透明工具欄且不再覆蓋專輯封面。</string>
+    <string name="pref_summary_opaque_statusbar_now_playing">於狀態列中使用不透明工具欄且不再覆蓋專輯封面。</string>
+    <string name="could_not_download_album_cover">"未能下載合適的專輯封面"</string>
     <string name="search_hint">正在掃描…</string>
     <string name="rescanning_media">正在重新掃描媒體庫…</string>
+    <string name="favorites">最愛</string>
+    <string name="last_added">上一次新增</string>
+    <string name="recently_played">最近播放</string>
+    <string name="my_top_tracks">我的最佳單曲</string>
+    <string name="remove_cover">移除封面</string>
+    <string name="download_from_last_fm">從Last.fm下載</string>
+    <string name="pick_from_local_storage">從本地存儲選擇</string>
+    <string name="web_search">網路搜尋</string>
+    <string name="action_sleep_timer">睡眠定時計</string>
+    <string name="action_set">設定</string>
+    <string name="cancel_current_timer">取消當前定時計</string>
+    <string name="sleep_timer_canceled">已取消睡眠定時計</string>
+    <string name="sleep_timer_set">設定睡眠定時計從現在開始%d分鐘</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0fd316d4..f56b487c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -162,7 +162,7 @@
     <string name="pref_summary_larger_title_box_now_playing">The box below the album art where the song title and artist goes is larger in its height.</string>
     <string name="pref_summary_alternative_progress_slider_now_playing">Uses a progressbar which does not cover the album art instead of the default progress slider.</string>
     <string name="pref_summary_playback_controller_card_now_playing">Displays a card below the playback controller buttons (play/pause etc.).</string>
-    <string name="pref_summary_ignore_media_store_artwork">The Android Media Store caches your embedded album artwork but on some devices it seems to store it at a low resolution. Enabling this will bypass the Media Store, which can increase the album art quality but causes slower image loading times.</string>
+    <string name="pref_summary_ignore_media_store_artwork">Bypass the Media Store, which can increase the album artwork quality but causes slower image loading times. Only enable this if you have problems with low resolution artworks.</string>
     <string name="could_not_download_album_cover">"Could not download a matching album cover."</string>
     <string name="search_hint">Search your library…</string>
     <string name="rescanning_media">Rescanning media…</string>