diff --git a/res/values-nb/translatable.xml b/res/values-nb/translatable.xml
index 1168f1dd..9377359e 100644
--- a/res/values-nb/translatable.xml
+++ b/res/values-nb/translatable.xml
@@ -153,40 +153,4 @@ THE SOFTWARE.
 	<string name="scrobble_summary">Scrobble til Last.FM via ScrobbleDroid eller Simple Last.FM Scrobbler</string>
 	<string name="stock_broadcast_title">Emuler Innebygd Sendinger</string>
 	<string name="stock_broadcast_summary">Send sendinger som emulerer den innebygde spilleren til å fungere med tredjeparts låseskjermer, widgets, etc.</string>
-
-	<string-array name="default_action_entries">
-		<item>Spill</item>
-		<item>Kø</item>
-		<item>Siste Brukte Handling</item>
-	</string-array>
-	<string-array name="notification_mode_entries">
-		<item>Aldri Vis</item>
-		<item>Vis Ved Avspilling</item>
-		<item>Alltid Vis</item>
-	</string-array>
-	<string-array name="notification_action_entries">
-		<item>Åpne Hoved Aktivitet</item>
-		<item>Åpne Mini Spiller</item>
-		<item>Hopp Til Neste Låt</item>
-	</string-array>
-	<string-array name="display_mode_entries">
-		<item>Info i overlappende Boks (standard)</item>
-		<item>Info Under Cover Bilde</item>
-		<item>Info I Stadig Lag</item>
-		<item>Info I Stadig Lag (Fullskjerm Cover)</item>
-	</string-array>
-	<string-array name="swipe_action_entries">
-		<item>Gjør Ingenting</item>
-		<item>Åpne Bibliotek</item>
-		<item>Spill/Pause</item>
-		<item>Neste Låt</item>
-		<item>Forrige Låt</item>
-		<item>Ters Gjenta</item>
-		<item>Ters Stokke</item>
-		<item>Kø Aktuelle Album</item>
-		<item>Kø Aktuelle Artist</item>
-		<item>Kø Aktuelle Gjanger</item>
-		<item>Tøm Kø</item>
-		<item>Ters Medieknapper</item>
-	</string-array>
 </resources>
diff --git a/res/values-sk/translatable.xml b/res/values-sk/translatable.xml
index a8dec533..e164beb9 100644
--- a/res/values-sk/translatable.xml
+++ b/res/values-sk/translatable.xml
@@ -160,40 +160,4 @@ THE SOFTWARE.
 	<string name="scrobble_summary">Scrobble prístup k Last.FM cez ScrobbleDroid alebo Simple Last.FM Scrobbler.</string>
 	<string name="stock_broadcast_title">Tváriť sa ako originálny prehrávač</string>
 	<string name="stock_broadcast_summary">Tvári sa ako originálny prehrávač hudby posielaním vysielania pre umožnenie spolupráce s ovládaniami, miniaplikáciami zamykania obrazovky.</string>
-
-	<string-array name="default_action_entries">
-		<item>Prehrať</item>
-		<item>Zaradiť do zoznamu</item>
-		<item>Naposledy použitá akcia</item>
-	</string-array>
-	<string-array name="notification_mode_entries">
-		<item>Nikdy nezobraziť</item>
-		<item>Zobraziť počas prehrávania</item>
-		<item>Vždy zobraziť</item>
-	</string-array>
-	<string-array name="notification_action_entries">
-		<item>Otvoriť hlavnú činnosť</item>
-		<item>Otvoriť mini prehrávač</item>
-		<item>Preskočiť na ďalšiu skladbu</item>
-	</string-array>
-	<string-array name="display_mode_entries">
-		<item>Informácie v prekrývajúcom ráme (predvolené)</item>
-		<item>Informácie pod obalom</item>
-		<item>Informácie vo vrstve Immobile</item>
-		<item>Informácie vo vrstve Immobile (obal na celej obrazovke)</item>
-	</string-array>
-	<string-array name="swipe_action_entries">
-		<item>Nerobiť nič</item>
-		<item>Otvoriť knižnicu</item>
-		<item>Prehrať/Pozastaviť</item>
-		<item>Nasledujúca skladba</item>
-		<item>Predchádzajúca skladba</item>
-		<item>Prepnúť opakovanie</item>
-		<item>Prepnúť náhodný výber</item>
-		<item>Pridať do zoznamu aktuálny album</item>
-		<item>Pridať do zoznamu aktuálneho interpreta</item>
-		<item>Pridať do zoznamu aktuálny žáner</item>
-		<item>Vymazať zoznam</item>
-		<item>Prepnúť ovládanie</item>
-	</string-array>
 </resources>
diff --git a/res/values/translatable.xml b/res/values/translatable.xml
index f3846696..ab4b2ba3 100644
--- a/res/values/translatable.xml
+++ b/res/values/translatable.xml
@@ -49,7 +49,7 @@ THE SOFTWARE.
 	<string name="overwrite">Overwrite</string>
 	<string name="cancel">Cancel</string>
 
-	<!-- Song Chooser -->
+	<!-- Library -->
 	<string name="enqueue">Enqueue</string>
 	<string name="play">Play</string>
 	<string name="edit">Edit</string>
@@ -163,40 +163,32 @@ THE SOFTWARE.
 	<string name="stock_broadcast_title">Emulate Stock Broadcasts</string>
 	<string name="stock_broadcast_summary">Send broadcasts emulating those sent by the stock music player to work with 3rd party lockscreen controls, widgets, etc.</string>
 
-	<string-array name="default_action_entries">
-		<item>Play</item>
-		<item>Enqueue</item>
-		<item>Last Used Action</item>
-	</string-array>
-	<string-array name="notification_mode_entries">
-		<item>Never Show</item>
-		<item>Show When Playing</item>
-		<item>Always Show</item>
-	</string-array>
-	<string-array name="notification_action_entries">
-		<item>Open Main Activity</item>
-		<item>Open Mini Player</item>
-		<item>Skip To Next Song</item>
-	</string-array>
-	<string-array name="display_mode_entries">
-		<item>Info In Overlapping Box (default)</item>
-		<item>Info Below Cover Art</item>
-		<item>Info In Immobile Layer</item>
-		<item>Info In Immobile Layer (Fullscreen Cover)</item>
-	</string-array>
-	<string-array name="swipe_action_entries">
-		<!-- This must match the order of swipe_action_values exactly -->
-		<item>Do Nothing</item>
-		<item>Open Library</item>
-		<item>Play/Pause</item>
-		<item>Next Song</item>
-		<item>Previous Song</item>
-		<item>Toggle Repeat</item>
-		<item>Toggle Shuffle</item>
-		<item>Enqueue Current Album</item>
-		<item>Enqueue Current Artist</item>
-		<item>Enqueue Current Genre</item>
-		<item>Clear Queue</item>
-		<item>Toggle Controls</item>
-	</string-array>
+	<!-- The following are for the list preferences -->
+	<string name="last_used_action">Last used action</string>
+
+	<string name="never_show">Never show</string>
+	<string name="show_when_playing">Show when playing (default)</string>
+	<string name="always_show">Always show</string>
+
+	<string name="open_main_activity">Open main activity (default)</string>
+	<string name="open_mini_popup">Open mini popup</string>
+	<string name="skip_to_next_song">Skip to next song</string>
+
+	<string name="info_on_cover">Info on cover art</string>
+	<string name="info_below_cover">Info below cover art</string>
+	<string name="fixed_info">Info fixed at top</string>
+	<string name="fixed_info_fullscreen">Info fixed at top (fullscreen cover art)</string>
+
+	<string name="do_nothing">Do nothing</string>
+	<string name="open_library">Open library</string>
+	<string name="play_pause">Play/Pause</string>
+	<string name="next_song">Next song</string>
+	<string name="previous_song">Previous song</string>
+	<string name="cycle_repeat_mode">Cycle repeat mode</string>
+	<string name="cycle_shuffle_mode">Cycle shuffle mode</string>
+	<string name="enqueue_current_album">Enqueue current album</string>
+	<string name="enqueue_current_artist">Enqueue current artist</string>
+	<string name="enqueue_current_genre">Enqueue current genre</string>
+	<string name="clear_queue">Clear queue</string>
+	<string name="toggle_controls">Toggle controls</string>
 </resources>
diff --git a/res/values/untranslatable.xml b/res/values/untranslatable.xml
index 08ddb01f..8dba3be0 100644
--- a/res/values/untranslatable.xml
+++ b/res/values/untranslatable.xml
@@ -53,4 +53,40 @@ THE SOFTWARE.
 		<item>ClearQueue</item>
 		<item>ToggleControls</item>
 	</string-array>
+	<string-array name="swipe_action_entries">
+		<!-- This must match the order of swipe_action_values exactly -->
+		<item>@string/do_nothing</item>
+		<item>@string/open_library</item>
+		<item>@string/play_pause</item>
+		<item>@string/next_song</item>
+		<item>@string/previous_song</item>
+		<item>@string/cycle_repeat_mode</item>
+		<item>@string/cycle_shuffle_mode</item>
+		<item>@string/enqueue_current_album</item>
+		<item>@string/enqueue_current_artist</item>
+		<item>@string/enqueue_current_genre</item>
+		<item>@string/clear_queue</item>
+		<item>@string/toggle_controls</item>
+	</string-array>
+	<string-array name="default_action_entries">
+		<item>@string/play</item>
+		<item>@string/enqueue</item>
+		<item>@string/last_used_action</item>
+	</string-array>
+	<string-array name="notification_mode_entries">
+		<item>@string/never_show</item>
+		<item>@string/show_when_playing</item>
+		<item>@string/always_show</item>
+	</string-array>
+	<string-array name="notification_action_entries">
+		<item>@string/open_main_activity</item>
+		<item>@string/open_mini_popup</item>
+		<item>@string/skip_to_next_song</item>
+	</string-array>
+	<string-array name="display_mode_entries">
+		<item>@string/info_on_cover</item>
+		<item>@string/info_below_cover</item>
+		<item>@string/fixed_info</item>
+		<item>@string/fixed_info_fullscreen</item>
+	</string-array>
 </resources>