From fa06732e94554d85dbc071e94ad9a7b6a814e195 Mon Sep 17 00:00:00 2001
From: OxygenCobalt <oxycblt@abstractr.net>
Date: Thu, 4 Aug 2022 15:27:35 -0600
Subject: [PATCH] strings: remove weird capitalization

Remove strange capitalization choices in an attempt to make the app
more consistent.
---
 CHANGELOG.md                                  |  3 +
 .../auxio/detail/AlbumDetailFragment.kt       |  4 +-
 .../auxio/detail/ArtistDetailFragment.kt      |  4 +-
 .../auxio/detail/GenreDetailFragment.kt       |  4 +-
 .../org/oxycblt/auxio/home/HomeFragment.kt    |  2 +-
 .../music/system/IndexerNotifications.kt      | 10 +-
 .../auxio/settings/SettingsListFragment.kt    |  6 +-
 .../oxycblt/auxio/ui/fragment/MenuFragment.kt | 16 ++--
 app/src/main/res/layout/fragment_about.xml    |  2 +-
 app/src/main/res/layout/fragment_search.xml   |  2 +-
 app/src/main/res/layout/widget_large.xml      |  4 +-
 app/src/main/res/layout/widget_medium.xml     |  6 +-
 app/src/main/res/layout/widget_thin.xml       |  4 +-
 app/src/main/res/values-ar-rIQ/strings.xml    | 10 +-
 app/src/main/res/values-cs/strings.xml        | 22 ++---
 app/src/main/res/values-de/strings.xml        | 22 ++---
 app/src/main/res/values-el/strings.xml        |  4 +-
 app/src/main/res/values-es/strings.xml        | 20 ++--
 app/src/main/res/values-fil/strings.xml       | 16 ++--
 app/src/main/res/values-fr/strings.xml        | 10 +-
 app/src/main/res/values-hi/strings.xml        |  4 +-
 app/src/main/res/values-hr/strings.xml        | 22 ++---
 app/src/main/res/values-hu/strings.xml        |  4 +-
 app/src/main/res/values-in/strings.xml        | 12 +--
 app/src/main/res/values-it/strings.xml        | 20 ++--
 app/src/main/res/values-ko/strings.xml        | 10 +-
 app/src/main/res/values-lt/strings.xml        | 18 ++--
 app/src/main/res/values-nl/strings.xml        | 12 +--
 app/src/main/res/values-pl/strings.xml        |  4 +-
 app/src/main/res/values-pt-rBR/strings.xml    | 12 +--
 app/src/main/res/values-pt-rPT/strings.xml    |  6 +-
 app/src/main/res/values-ro/strings.xml        |  6 +-
 app/src/main/res/values-ru/strings.xml        | 18 ++--
 app/src/main/res/values-tr/strings.xml        | 20 ++--
 app/src/main/res/values-uk/strings.xml        |  4 +-
 app/src/main/res/values-zh-rCN/strings.xml    | 12 +--
 app/src/main/res/values-zh-rTW/strings.xml    |  4 +-
 app/src/main/res/values/strings.xml           | 94 ++++++++++---------
 38 files changed, 216 insertions(+), 237 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53d3f4ff6..5dad22b25 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -36,6 +36,9 @@ in startup
 #### What's Changed
 - Play and skip icons are filled again
 - Updated music hashing (Will wipe playback state)
+- Removed unnecessary capitalization
+
+#### Dev/Meta
 - Migrated to BottomSheetBehavior
 
 ## 2.5.0
diff --git a/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt b/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt
index 3f5caac1c..34646af39 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/AlbumDetailFragment.kt
@@ -112,12 +112,12 @@ class AlbumDetailFragment :
         return when (item.itemId) {
             R.id.action_play_next -> {
                 playbackModel.playNext(unlikelyToBeNull(detailModel.currentAlbum.value))
-                requireContext().showToast(R.string.lbl_queue_added)
+                requireContext().showToast(R.string.lng_queue_added)
                 true
             }
             R.id.action_queue_add -> {
                 playbackModel.addToQueue(unlikelyToBeNull(detailModel.currentAlbum.value))
-                requireContext().showToast(R.string.lbl_queue_added)
+                requireContext().showToast(R.string.lng_queue_added)
                 true
             }
             R.id.action_go_artist -> {
diff --git a/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt b/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt
index b964c92ff..fcd8459ba 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/ArtistDetailFragment.kt
@@ -108,12 +108,12 @@ class ArtistDetailFragment :
         return when (item.itemId) {
             R.id.action_play_next -> {
                 playbackModel.playNext(unlikelyToBeNull(detailModel.currentArtist.value))
-                requireContext().showToast(R.string.lbl_queue_added)
+                requireContext().showToast(R.string.lng_queue_added)
                 true
             }
             R.id.action_queue_add -> {
                 playbackModel.addToQueue(unlikelyToBeNull(detailModel.currentArtist.value))
-                requireContext().showToast(R.string.lbl_queue_added)
+                requireContext().showToast(R.string.lng_queue_added)
                 true
             }
             else -> false
diff --git a/app/src/main/java/org/oxycblt/auxio/detail/GenreDetailFragment.kt b/app/src/main/java/org/oxycblt/auxio/detail/GenreDetailFragment.kt
index 22b8ad5c8..d26344988 100644
--- a/app/src/main/java/org/oxycblt/auxio/detail/GenreDetailFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/detail/GenreDetailFragment.kt
@@ -108,12 +108,12 @@ class GenreDetailFragment :
         return when (item.itemId) {
             R.id.action_play_next -> {
                 playbackModel.playNext(unlikelyToBeNull(detailModel.currentGenre.value))
-                requireContext().showToast(R.string.lbl_queue_added)
+                requireContext().showToast(R.string.lng_queue_added)
                 true
             }
             R.id.action_queue_add -> {
                 playbackModel.addToQueue(unlikelyToBeNull(detailModel.currentGenre.value))
-                requireContext().showToast(R.string.lbl_queue_added)
+                requireContext().showToast(R.string.lng_queue_added)
                 true
             }
             else -> false
diff --git a/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt b/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt
index 616d9936f..6985f1597 100644
--- a/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/home/HomeFragment.kt
@@ -326,7 +326,7 @@ class HomeFragment : ViewBindingFragment<FragmentHomeBinding>(), Toolbar.OnMenuI
 
         when (indexing) {
             is Indexer.Indexing.Indeterminate -> {
-                binding.homeIndexingStatus.textSafe = getString(R.string.lbl_indexing_desc)
+                binding.homeIndexingStatus.textSafe = getString(R.string.lng_indexing_desc)
                 binding.homeIndexingProgress.isIndeterminate = true
             }
             is Indexer.Indexing.Songs -> {
diff --git a/app/src/main/java/org/oxycblt/auxio/music/system/IndexerNotifications.kt b/app/src/main/java/org/oxycblt/auxio/music/system/IndexerNotifications.kt
index 4c60c7115..7134d38b6 100644
--- a/app/src/main/java/org/oxycblt/auxio/music/system/IndexerNotifications.kt
+++ b/app/src/main/java/org/oxycblt/auxio/music/system/IndexerNotifications.kt
@@ -37,8 +37,8 @@ class IndexingNotification(private val context: Context) :
         setSilent(true)
         setContentIntent(context.newMainPendingIntent())
         setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-        setContentTitle(context.getString(R.string.lbl_indexing))
-        setContentText(context.getString(R.string.lbl_indexing_desc))
+        setContentTitle(context.getString(R.string.lng_indexing))
+        setContentText(context.getString(R.string.lng_indexing_desc))
         setProgress(0, 0, true)
     }
 
@@ -49,7 +49,7 @@ class IndexingNotification(private val context: Context) :
         when (indexing) {
             is Indexer.Indexing.Indeterminate -> {
                 logD("Updating state to $indexing")
-                setContentText(context.getString(R.string.lbl_indexing_desc))
+                setContentText(context.getString(R.string.lng_indexing_desc))
                 setProgress(0, 0, true)
                 return true
             }
@@ -78,8 +78,8 @@ class ObservingNotification(context: Context) : ServiceNotification(context, IND
         setSilent(true)
         setContentIntent(context.newMainPendingIntent())
         setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-        setContentTitle(context.getString(R.string.lbl_observing))
-        setContentText(context.getString(R.string.lbl_observing_desc))
+        setContentTitle(context.getString(R.string.lng_observing))
+        setContentText(context.getString(R.string.lng_observing_desc))
     }
 
     override val code: Int
diff --git a/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt b/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt
index 87b3a2e60..67d4db54e 100644
--- a/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/settings/SettingsListFragment.kt
@@ -116,15 +116,15 @@ class SettingsListFragment : PreferenceFragmentCompat() {
     override fun onPreferenceTreeClick(preference: Preference): Boolean {
         when (preference.key) {
             getString(R.string.set_key_save_state) -> {
-                playbackModel.savePlaybackState { context?.showToast(R.string.lbl_state_saved) }
+                playbackModel.savePlaybackState { context?.showToast(R.string.lng_state_saved) }
             }
             getString(R.string.set_key_wipe_state) -> {
-                playbackModel.wipePlaybackState { context?.showToast(R.string.lbl_state_wiped) }
+                playbackModel.wipePlaybackState { context?.showToast(R.string.lng_state_wiped) }
             }
             getString(R.string.set_key_restore_state) ->
                 playbackModel.tryRestorePlaybackState { restored ->
                     if (restored) {
-                        context?.showToast(R.string.lbl_state_restored)
+                        context?.showToast(R.string.lng_state_restored)
                     } else {
                         context?.showToast(R.string.err_did_not_restore)
                     }
diff --git a/app/src/main/java/org/oxycblt/auxio/ui/fragment/MenuFragment.kt b/app/src/main/java/org/oxycblt/auxio/ui/fragment/MenuFragment.kt
index e3b0ba6c3..6406349f6 100644
--- a/app/src/main/java/org/oxycblt/auxio/ui/fragment/MenuFragment.kt
+++ b/app/src/main/java/org/oxycblt/auxio/ui/fragment/MenuFragment.kt
@@ -58,11 +58,11 @@ abstract class MenuFragment<T : ViewBinding> : ViewBindingFragment<T>() {
             when (id) {
                 R.id.action_play_next -> {
                     playbackModel.playNext(song)
-                    requireContext().showToast(R.string.lbl_queue_added)
+                    requireContext().showToast(R.string.lng_queue_added)
                 }
                 R.id.action_queue_add -> {
                     playbackModel.addToQueue(song)
-                    requireContext().showToast(R.string.lbl_queue_added)
+                    requireContext().showToast(R.string.lng_queue_added)
                 }
                 R.id.action_go_artist -> {
                     navModel.exploreNavigateTo(song.album.artist)
@@ -100,11 +100,11 @@ abstract class MenuFragment<T : ViewBinding> : ViewBindingFragment<T>() {
                 }
                 R.id.action_play_next -> {
                     playbackModel.playNext(album)
-                    requireContext().showToast(R.string.lbl_queue_added)
+                    requireContext().showToast(R.string.lng_queue_added)
                 }
                 R.id.action_queue_add -> {
                     playbackModel.addToQueue(album)
-                    requireContext().showToast(R.string.lbl_queue_added)
+                    requireContext().showToast(R.string.lng_queue_added)
                 }
                 R.id.action_go_artist -> {
                     navModel.exploreNavigateTo(album.artist)
@@ -136,11 +136,11 @@ abstract class MenuFragment<T : ViewBinding> : ViewBindingFragment<T>() {
                 }
                 R.id.action_play_next -> {
                     playbackModel.playNext(artist)
-                    requireContext().showToast(R.string.lbl_queue_added)
+                    requireContext().showToast(R.string.lng_queue_added)
                 }
                 R.id.action_queue_add -> {
                     playbackModel.addToQueue(artist)
-                    requireContext().showToast(R.string.lbl_queue_added)
+                    requireContext().showToast(R.string.lng_queue_added)
                 }
                 else -> {
                     logEOrThrow("Unexpected menu item selected")
@@ -169,11 +169,11 @@ abstract class MenuFragment<T : ViewBinding> : ViewBindingFragment<T>() {
                 }
                 R.id.action_play_next -> {
                     playbackModel.playNext(genre)
-                    requireContext().showToast(R.string.lbl_queue_added)
+                    requireContext().showToast(R.string.lng_queue_added)
                 }
                 R.id.action_queue_add -> {
                     playbackModel.addToQueue(genre)
-                    requireContext().showToast(R.string.lbl_queue_added)
+                    requireContext().showToast(R.string.lng_queue_added)
                 }
                 else -> {
                     logEOrThrow("Unexpected menu item selected")
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index ebb893ee5..24bf05b88 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -155,7 +155,7 @@
                         style="@style/Widget.Auxio.TextView.Icon"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:text="@string/lbl_author"
+                        android:text="@string/lng_author"
                         app:drawableStartCompat="@drawable/ic_author_24"
                         app:drawableTint="?attr/colorControlNormal"
                         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 4d994b52f..eb78f6051 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -33,7 +33,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="@android:color/transparent"
-                    android:hint="@string/hint_search_library"
+                    android:hint="@string/lng_search_library"
                     android:imeOptions="actionSearch|flagNoExtractUi"
                     android:inputType="textFilter"
                     android:paddingStart="@dimen/spacing_tiny"
diff --git a/app/src/main/res/layout/widget_large.xml b/app/src/main/res/layout/widget_large.xml
index 41df52902..b3feb70b1 100644
--- a/app/src/main/res/layout/widget_large.xml
+++ b/app/src/main/res/layout/widget_large.xml
@@ -56,7 +56,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/spacing_medium"
             android:layout_marginEnd="@dimen/spacing_medium"
-            android:text="@string/def_widget_song" />
+            tools:text="Song name" />
 
         <android.widget.TextView
             android:id="@+id/widget_artist"
@@ -65,7 +65,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/spacing_medium"
             android:layout_marginEnd="@dimen/spacing_medium"
-            android:text="@string/def_widget_artist" />
+            tools:text="Artist name" />
 
         <!-- See widget_small.xml for an explanation of the view layout -->
 
diff --git a/app/src/main/res/layout/widget_medium.xml b/app/src/main/res/layout/widget_medium.xml
index 226b2dd06..ddcddd9a0 100644
--- a/app/src/main/res/layout/widget_medium.xml
+++ b/app/src/main/res/layout/widget_medium.xml
@@ -56,7 +56,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/spacing_medium"
             android:layout_marginEnd="@dimen/spacing_medium"
-            android:text="@string/def_widget_song" />
+            tools:text="Song name" />
 
         <android.widget.TextView
             android:id="@+id/widget_artist"
@@ -65,7 +65,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/spacing_medium"
             android:layout_marginEnd="@dimen/spacing_medium"
-            android:text="@string/def_widget_artist" />
+            tools:text="Artist name" />
 
         <android.widget.LinearLayout
             android:id="@+id/widget_controls"
@@ -90,7 +90,6 @@
                 android:layout_height="match_parent"
                 android:layout_weight="1" />
 
-
             <android.widget.ImageButton
                 android:id="@+id/widget_play_pause"
                 style="@style/Widget.Auxio.MaterialButton.AppWidget.PlayPause"
@@ -99,7 +98,6 @@
                 android:contentDescription="@string/desc_play_pause"
                 android:src="@drawable/ic_play_24" />
 
-
             <android.widget.ImageView
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/widget_thin.xml b/app/src/main/res/layout/widget_thin.xml
index 1ddd29783..2127870f1 100644
--- a/app/src/main/res/layout/widget_thin.xml
+++ b/app/src/main/res/layout/widget_thin.xml
@@ -79,14 +79,14 @@
                 style="@style/Widget.Auxio.TextView.Primary.AppWidget"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/def_widget_song" />
+                tools:text="Song name" />
 
             <android.widget.TextView
                 android:id="@+id/widget_artist"
                 style="@style/Widget.Auxio.TextView.Secondary.AppWidget"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/def_widget_artist" />
+                tools:text="Artist name" />
 
         </android.widget.LinearLayout>
 
diff --git a/app/src/main/res/values-ar-rIQ/strings.xml b/app/src/main/res/values-ar-rIQ/strings.xml
index 298c13ffa..525ec73c1 100644
--- a/app/src/main/res/values-ar-rIQ/strings.xml
+++ b/app/src/main/res/values-ar-rIQ/strings.xml
@@ -38,12 +38,12 @@
     <string name="lbl_queue">طابور</string>
     <string name="lbl_play_next">شغل تالياً</string>
     <string name="lbl_queue_add">أضف إلى الطابور</string>
-    <string name="lbl_queue_added">تمت الإضافة إلى الطابور</string>
+    <string name="lng_queue_added">تمت الإضافة إلى الطابور</string>
 
     <string name="lbl_go_artist">أذهب إلى الفنان</string>
     <string name="lbl_go_album">أذهب إلى الالبوم</string>
 
-    <string name="lbl_state_saved">تم حفظ الحالة</string>
+    <string name="lng_state_saved">تم حفظ الحالة</string>
 
     <string name="lbl_add">أضف</string>
     <string name="lbl_save">احفظ</string>
@@ -54,7 +54,7 @@
     <string name="lbl_code">عرض على جيتهاب</string>
     <string name="lbl_faq">اسئلة وأجوبة</string>
     <string name="lbl_licenses">التراخيص</string>
-    <string name="lbl_author">تمت برمجة التطبيق من قبل OxygenCobalt</string>
+    <string name="lng_author">تمت برمجة التطبيق من قبل OxygenCobalt</string>
 
     <!-- Settings namespace | Settings-related labels -->
     <string name="set_title">الإعدادات</string>
@@ -108,7 +108,7 @@
     <string name="err_bad_dir">هذا المجلد غير مدعوم</string>
 
     <!-- Hint Namespace | EditText Hints -->
-    <string name="hint_search_library">البحث في مكتبتك…</string>
+    <string name="lng_search_library">البحث في مكتبتك…</string>
 
     <!-- Description Namespace | Accessibility Strings -->
     <string name="desc_track_number">المقطع %d</string>
@@ -136,8 +136,6 @@
     <string name="def_genre">نوع غير معروف</string>
     <string name="def_date">لا تاريخ</string>
     <string name="def_playback">لا يعمل موسيقى</string>
-    <string name="def_widget_song">اسم الاغنية</string>
-    <string name="def_widget_artist">اسم الفنان</string>
 
     <!-- Color Label namespace | Accent names -->
     <string name="clr_red">احمر</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index cd16c0032..7b361bf6a 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -6,7 +6,7 @@
     <string name="info_indexer_channel_name">Načítání hudby</string>
     <string name="info_widget_desc">Zobrazení a ovládání přehrávání hudby</string>
     <!-- Label Namespace | Static Labels -->
-    <string name="lbl_indexing_desc">Načítání vaší hudební knihovny…</string>
+    <string name="lng_indexing_desc">Načítání vaší hudební knihovny…</string>
     <string name="lbl_retry">Zkusit znovu</string>
     <string name="lbl_grant">Udělit</string>
     <string name="lbl_genres">Žánry</string>
@@ -37,10 +37,10 @@
     <string name="lbl_queue">Fronta</string>
     <string name="lbl_play_next">Přehrát další</string>
     <string name="lbl_queue_add">Přidat do fronty</string>
-    <string name="lbl_queue_added">Přidáno do fronty</string>
+    <string name="lng_queue_added">Přidáno do fronty</string>
     <string name="lbl_go_artist">Přejít na umělce</string>
     <string name="lbl_go_album">Přejít na album</string>
-    <string name="lbl_state_saved">Stav uložen</string>
+    <string name="lng_state_saved">Stav uložen</string>
     <!-- Actual string: Ok -->
     <string name="lbl_ok">@android:string/ok</string>
     <!-- Actual string: Cancel -->
@@ -53,7 +53,7 @@
     <string name="lbl_code">Zobrazit na GitHubu</string>
     <string name="lbl_faq">Často kladené otázky</string>
     <string name="lbl_licenses">Licence</string>
-    <string name="lbl_author">Vytvořil OxygenCobalt</string>
+    <string name="lng_author">Vytvořil OxygenCobalt</string>
     <string name="lbl_library_counts">Statistiky knihovny</string>
     <!-- Settings namespace | Settings-related labels -->
     <string name="set_title">Nastavení</string>
@@ -110,7 +110,7 @@
     <string name="err_no_dirs">Žádné složky</string>
     <string name="err_bad_dir">Tato složka není podporována</string>
     <!-- Hint Namespace | EditText Hints -->
-    <string name="hint_search_library">Prohledat vaší knihovnu…</string>
+    <string name="lng_search_library">Prohledat vaší knihovnu…</string>
     <!-- Description Namespace | Accessibility Strings -->
     <string name="desc_track_number">Skladba %d</string>
     <string name="desc_play_pause">Přehrát nebo pozastavit</string>
@@ -135,8 +135,6 @@
     <string name="def_date">Žádné datum</string>
     <string name="def_track">Žádné číslo stopy</string>
     <string name="def_playback">Nehraje žádná hudba</string>
-    <string name="def_widget_song">Název skladby</string>
-    <string name="def_widget_artist">Název umělce</string>
     <!-- Color Label namespace | Accent names -->
     <string name="clr_red">Červená</string>
     <string name="clr_pink">Růžová</string>
@@ -210,14 +208,14 @@
     <string name="set_quality_tags">Ignorovat štítky MediaStore</string>
     <string name="set_quality_tags_desc">Zvýší kvalitu štítků, ale má za následek delší načítací čas (experimentální)</string>
     <string name="set_restore">Obnovit stav přehrávání</string>
-    <string name="lbl_state_restored">Stav obnoven</string>
+    <string name="lng_state_restored">Stav obnoven</string>
     <string name="set_restore_desc">Obnovit dříve uložený stav přehrávání (pokud existuje)</string>
     <string name="err_did_not_restore">Nemohl být obnoven žádný stav</string>
-    <string name="lbl_observing">Monitorování hudební knihovny</string>
+    <string name="lng_observing">Monitorování hudební knihovny</string>
     <string name="set_observing">Automatické znovunačítání</string>
-    <string name="lbl_observing_desc">Sledování změn v hudební knihovně…</string>
+    <string name="lng_observing_desc">Sledování změn v hudební knihovně…</string>
     <string name="set_observing_desc">Znovu načíst vaší hudební knihovnu při změně (experimentální)</string>
-    <string name="lbl_indexing">Načítání hudby</string>
+    <string name="lng_indexing">Načítání hudby</string>
     <string name="lbl_sort_date_added">Datum přidání</string>
     <string name="lbl_single">Singl</string>
     <string name="lbl_singles">Singly</string>
@@ -239,6 +237,6 @@
     <string name="lbl_ep_remix">Remixové EP</string>
     <string name="set_wipe">Vymazat stav přehrávání</string>
     <string name="set_wipe_desc">Vymazat dříve uložený stav přehrávání (pokud existuje)</string>
-    <string name="lbl_state_wiped">Stav vymazán</string>
+    <string name="lng_state_wiped">Stav vymazán</string>
     <string name="desc_queue_bar">Otevřít frontu</string>
 </resources>
\ 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 af9324ea8..327316343 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -25,10 +25,10 @@
     <string name="lbl_queue">Warteschlange</string>
     <string name="lbl_play_next">Spiele als Nächstes</string>
     <string name="lbl_queue_add">Zur Warteschlange hinzufügen</string>
-    <string name="lbl_queue_added">Der Warteschlange hinzugefügt</string>
+    <string name="lng_queue_added">Der Warteschlange hinzugefügt</string>
     <string name="lbl_go_artist">Zum Künstler gehen</string>
     <string name="lbl_go_album">Zum Album gehen</string>
-    <string name="lbl_state_saved">Wiedergabezustand gespeichert</string>
+    <string name="lng_state_saved">Wiedergabezustand gespeichert</string>
     <string name="lbl_add">Hinzufügen</string>
     <string name="lbl_save">Speichern</string>
     <string name="err_no_dirs">Keine Ordner</string>
@@ -37,7 +37,7 @@
     <string name="lbl_code">Auf GitHub ansehen</string>
     <string name="lbl_faq">FAQ</string>
     <string name="lbl_licenses">Lizenzen</string>
-    <string name="lbl_author">Entwickelt von OxygenCobalt</string>
+    <string name="lng_author">Entwickelt von OxygenCobalt</string>
     <string name="lbl_off">Aus</string>
     <!-- Settings namespace | Settings-related labels -->
     <string name="set_title">Einstellungen</string>
@@ -85,7 +85,7 @@
     <string name="err_no_app">Link konnte nicht geöffnet werden</string>
     <string name="err_bad_dir">Das Verzeichnis wird nicht unterstützt</string>
     <!-- Hint Namespace | EditText Hints -->
-    <string name="hint_search_library">Musikbibliothek durchsuchen…</string>
+    <string name="lng_search_library">Musikbibliothek durchsuchen…</string>
     <!-- Description Namespace | Accessibility Strings -->
     <string name="desc_track_number">Titel %d</string>
     <string name="desc_play_pause">Abspielen oder pausieren</string>
@@ -141,8 +141,6 @@
     <string name="desc_music_dir_delete">Verzechnis entfernen</string>
     <string name="desc_no_cover">Albumcover</string>
     <string name="def_playback">Keine Musik wird gespielt</string>
-    <string name="def_widget_song">Liedname</string>
-    <string name="def_widget_artist">Künstlername</string>
     <string name="set_lib_tabs">Bibliotheks-Registerkarten</string>
     <string name="set_lib_tabs_desc">Sichtbarkeit und Ordnung der Bibliotheksregisterkarten ändern</string>
     <string name="lbl_sort_name">Name</string>
@@ -192,7 +190,7 @@
     <string name="lbl_shuffle_shortcut_short">Mischen</string>
     <string name="lbl_shuffle_shortcut_long">Alle mischen</string>
     <string name="info_indexer_channel_name">Musikwiedergabe</string>
-    <string name="lbl_indexing_desc">Lade deine Musikbibliothek…</string>
+    <string name="lng_indexing_desc">Lade deine Musikbibliothek…</string>
     <string name="lbl_sample_rate">Abtastrate</string>
     <string name="lbl_song_detail">Zeige Eigenschaften an</string>
     <string name="lbl_props">Lied-Eigenschaften</string>
@@ -203,13 +201,13 @@
     <string name="lbl_bitrate">Bitrate</string>
     <string name="set_quality_tags">MediaStore-Tags ignorieren</string>
     <string name="set_quality_tags_desc">Erhöht Tag-Qualität, benötigt aber längere Ladezeiten (Experimentell)</string>
-    <string name="lbl_observing">Überwachen der Musikbibliothek</string>
-    <string name="lbl_indexing">Musik wird geladen</string>
-    <string name="lbl_observing_desc">Musikbibliothek wird auf Änderungen überwacht…</string>
+    <string name="lng_observing">Überwachen der Musikbibliothek</string>
+    <string name="lng_indexing">Musik wird geladen</string>
+    <string name="lng_observing_desc">Musikbibliothek wird auf Änderungen überwacht…</string>
     <string name="lbl_sort_date_added">Hinzugefügt am</string>
     <string name="set_observing_desc">Musikbibliothek neuladen, sobald es Änderungen gibt (Experimentell)</string>
     <string name="set_observing">Automatisch neuladen</string>
-    <string name="lbl_state_restored">Zustand wiederhergestellt</string>
+    <string name="lng_state_restored">Zustand wiederhergestellt</string>
     <string name="set_restore_desc">Den vorher gespeicherten Wiedergabezustand wiederherstellen (wenn verfügbar)</string>
     <string name="err_did_not_restore">Kein Zustand konnte wiederhergestellt werden</string>
     <string name="lbl_ep">EP</string>
@@ -232,6 +230,6 @@
     <string name="lbl_single_remix">Remix-Single</string>
     <string name="lbl_live_group">Live</string>
     <string name="set_wipe_desc">Den vorher gespeicherten Wiedergabezustand löschen (wenn vorhanden)</string>
-    <string name="lbl_state_wiped">Zustand gelöscht</string>
+    <string name="lng_state_wiped">Zustand gelöscht</string>
     <string name="set_wipe">Wiedergabezustand löschen</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index f34fa10f7..f877c46ba 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -23,7 +23,7 @@
     <string name="lbl_queue">Ουρά αναπαραγωγής</string>
     <string name="lbl_play_next">Επόμενο</string>
     <string name="lbl_queue_add">Προσθήκη στην ουρά αναπ/γής</string>
-    <string name="lbl_queue_added">Προστέθηκε ένας τίτλος στην ουρά αναπαραγωγής</string>
+    <string name="lng_queue_added">Προστέθηκε ένας τίτλος στην ουρά αναπαραγωγής</string>
 
     <string name="lbl_go_artist">Πήγαινε στον καλλιτέχνη</string>
     <string name="lbl_go_album">Πήγαινε στο άλμπουμ</string>
@@ -56,7 +56,7 @@
     <string name="desc_play_pause">Αναπαραγωγή/Παύση</string>
 
     <!-- Hint Namespace | EditText Hints -->
-    <string name="hint_search_library">Αναζήτηση στη βιβλιοθήκη…</string>
+    <string name="lng_search_library">Αναζήτηση στη βιβλιοθήκη…</string>
 
     <!-- Color Label namespace | Accent names -->
     <string name="clr_red">Κόκκινος</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 7146e58bd..b5ed18196 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -31,10 +31,10 @@
     <string name="lbl_queue">Cola</string>
     <string name="lbl_play_next">Reproducir siguiente</string>
     <string name="lbl_queue_add">Agregar a la cola</string>
-    <string name="lbl_queue_added">Agregado a la cola</string>
+    <string name="lng_queue_added">Agregado a la cola</string>
     <string name="lbl_go_artist">Ir al artista</string>
     <string name="lbl_go_album">Ir al álbum</string>
-    <string name="lbl_state_saved">Estado guardado</string>
+    <string name="lng_state_saved">Estado guardado</string>
     <string name="lbl_add">Agregar</string>
     <string name="lbl_save">Guardar</string>
     <string name="err_no_dirs">Sin carpetas</string>
@@ -43,7 +43,7 @@
     <string name="lbl_code">Ver en GitHub</string>
     <string name="lbl_faq">Preguntas frecuentes</string>
     <string name="lbl_licenses">Licencias</string>
-    <string name="lbl_author">Desarrollado por OxygenCobalt</string>
+    <string name="lng_author">Desarrollado por OxygenCobalt</string>
     <!-- Settings namespace | Settings-related labels -->
     <string name="set_title">Ajustes</string>
     <string name="set_ui">Apariencia</string>
@@ -92,7 +92,7 @@
     <string name="err_no_app">Sin aplicación para abrir este enlace</string>
     <string name="err_bad_dir">Directorio no soportado</string>
     <!-- Hint Namespace | EditText Hints -->
-    <string name="hint_search_library">Buscar en la biblioteca…</string>
+    <string name="lng_search_library">Buscar en la biblioteca…</string>
     <!-- Description Namespace | Accessibility Strings -->
     <string name="desc_track_number">Pista %d</string>
     <string name="desc_play_pause">Reproducir o pausar</string>
@@ -117,8 +117,6 @@
     <string name="def_date">Sin fecha</string>
     <string name="def_track">Sin número de pista</string>
     <string name="def_playback">Sin música en reproducción</string>
-    <string name="def_widget_song">Song Name</string>
-    <string name="def_widget_artist">Artist Name</string>
     <!-- Color Label namespace | Accent names -->
     <string name="clr_red">Rojo</string>
     <string name="clr_pink">Rosa</string>
@@ -174,14 +172,14 @@
     <string name="fmt_lib_genre_count">Géneros cargados: %d</string>
     <string name="info_indexer_channel_name">Carga de música</string>
     <string name="lbl_sort_count">Número de canciones</string>
-    <string name="lbl_state_restored">Estado restaurado</string>
+    <string name="lng_state_restored">Estado restaurado</string>
     <string name="set_observing">Recarga automática</string>
     <string name="set_observing_desc">Recarga tu biblioteca de música cuando cambia (Experimental)</string>
     <string name="err_did_not_restore">No se puedo restaurar ningún estado</string>
-    <string name="lbl_indexing_desc">Cargando tu librería de música…</string>
-    <string name="lbl_indexing">Cargando música</string>
-    <string name="lbl_observing">Monitorizando la librería de música</string>
-    <string name="lbl_observing_desc">Monitorizando cambios en tu librería de música…</string>
+    <string name="lng_indexing_desc">Cargando tu librería de música…</string>
+    <string name="lng_indexing">Cargando música</string>
+    <string name="lng_observing">Monitorizando la librería de música</string>
+    <string name="lng_observing_desc">Monitorizando cambios en tu librería de música…</string>
     <string name="cdc_ogg">Audio Ogg</string>
     <string name="set_detail_song_playback_mode">Cuando se reproduce desde los detalles</string>
     <string name="lbl_sort_date_added">Fecha de añadido</string>
diff --git a/app/src/main/res/values-fil/strings.xml b/app/src/main/res/values-fil/strings.xml
index 1de1e8eb6..11e023037 100644
--- a/app/src/main/res/values-fil/strings.xml
+++ b/app/src/main/res/values-fil/strings.xml
@@ -2,19 +2,19 @@
 <resources>
     <string name="set_replay_gain_album">Naisin ang album</string>
     <string name="lbl_retry">Subukan muli</string>
-    <string name="lbl_indexing_desc">Nilo-load ang iyong music library…</string>
-    <string name="lbl_observing_desc">Tinitignan ang iyong music library para sa mga pagbabago…</string>
+    <string name="lng_indexing_desc">Nilo-load ang iyong music library…</string>
+    <string name="lng_observing_desc">Tinitignan ang iyong music library para sa mga pagbabago…</string>
     <string name="lbl_all_songs">Lahat ng Kanta</string>
     <string name="lbl_albums">Mga Album</string>
     <string name="lbl_album">Album</string>
     <string name="lbl_album_live">Live na album</string>
     <string name="lbl_album_remix">Remix album</string>
     <string name="lbl_ep">EP</string>
-    <string name="lbl_indexing">Nilo-load ang music</string>
+    <string name="lng_indexing">Nilo-load ang music</string>
     <string name="info_playback_channel_name">Pagtugtog ng kanta</string>
     <string name="info_indexer_channel_name">Pagload ng kanta</string>
     <string name="lbl_eps">Mga EP</string>
-    <string name="lbl_observing">Tinitignan ang music library</string>
+    <string name="lng_observing">Tinitignan ang music library</string>
     <string name="lbl_single">Single</string>
     <string name="lbl_single_live">Live na single</string>
     <string name="lbl_single_remix">Remix single</string>
@@ -42,7 +42,7 @@
     <string name="lbl_queue">Ipa-pilahin</string>
     <string name="lbl_play_next">Tugtugin pagkatapos</string>
     <string name="lbl_queue_add">Idagdag sa pila</string>
-    <string name="lbl_queue_added">Idiinagdag sa pila</string>
+    <string name="lng_queue_added">Idiinagdag sa pila</string>
     <string name="lbl_go_artist">Puntahan ang artista</string>
     <string name="lbl_go_album">Puntahan ang album</string>
     <string name="lbl_song_detail">Tignan ang katangian</string>
@@ -52,8 +52,8 @@
     <string name="lbl_size">Laki</string>
     <string name="lbl_bitrate">Tulin ng mga bit</string>
     <string name="lbl_sample_rate">Tulin ng sample</string>
-    <string name="lbl_state_restored">Naibalik ang kalagayan</string>
-    <string name="lbl_state_saved">Na-save ang kalagayan</string>
+    <string name="lng_state_restored">Naibalik ang kalagayan</string>
+    <string name="lng_state_saved">Na-save ang kalagayan</string>
     <string name="lbl_shuffle_shortcut_short">Haluin</string>
     <string name="lbl_add">Idagdag</string>
     <string name="lbl_save">I-save</string>
@@ -63,7 +63,7 @@
     <string name="lbl_code">Tignan sa GitHub</string>
     <string name="lbl_faq">Mga Madalas Itanong (FAQ)</string>
     <string name="lbl_licenses">Mga Lisensya</string>
-    <string name="lbl_author">Binuo ni OxygenCobalt</string>
+    <string name="lng_author">Binuo ni OxygenCobalt</string>
     <string name="lbl_library_counts">Istatistika ng library</string>
     <string name="set_title">Mga Setting</string>
     <string name="set_ui">Hitsura</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 670409715..76d476281 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -19,7 +19,7 @@
     <string name="lbl_queue">File d\'attente</string>
     <string name="lbl_play_next">Jouer ensuite</string>
     <string name="lbl_queue_add">Ajouter à la file d\'attente</string>
-    <string name="lbl_queue_added">Ajouté à la file d\'attente</string>
+    <string name="lng_queue_added">Ajouté à la file d\'attente</string>
     <string name="lbl_go_album">Aller à l\'album</string>
     <string name="lbl_go_artist">Aller à l\'artiste</string>
     <string name="lbl_about">À propos</string>
@@ -27,7 +27,7 @@
     <string name="lbl_code">Voir sur GitHub</string>
     <string name="lbl_faq">FAQ</string>
     <string name="lbl_licenses">Licences</string>
-    <string name="lbl_author">Développé par OxygenCobalt</string>
+    <string name="lng_author">Développé par OxygenCobalt</string>
     <!-- Settings namespace | Settings-related labels -->
     <string name="set_title">Paramètres</string>
     <string name="set_ui">Apparence</string>
@@ -45,7 +45,7 @@
     <string name="desc_track_number">Morceau %d</string>
     <string name="desc_play_pause">Lecture/Pause</string>
     <!-- Hint Namespace | EditText Hints -->
-    <string name="hint_search_library">Recherche dans votre bibliothèque…</string>
+    <string name="lng_search_library">Recherche dans votre bibliothèque…</string>
     <!-- Color Label namespace | Accent names -->
     <string name="clr_red">Rouge</string>
     <string name="clr_pink">Rose</string>
@@ -74,7 +74,7 @@
         <item quantity="other">%s Albums</item>
     </plurals>
     <string name="lbl_format">Format</string>
-    <string name="lbl_state_saved">État sauvegardé</string>
+    <string name="lng_state_saved">État sauvegardé</string>
     <string name="lbl_shuffle_shortcut_short">Mélanger</string>
     <string name="lbl_ok">OK</string>
     <string name="lbl_library_counts">Statistiques de la bibliothèque</string>
@@ -101,7 +101,7 @@
     <string name="info_playback_channel_name">Lecture de musique</string>
     <string name="info_indexer_channel_name">Chargement de musique</string>
     <string name="info_widget_desc">Afficher et contrôler la lecture de la musique</string>
-    <string name="lbl_indexing_desc">Chargement de votre bibliothèque musicale…</string>
+    <string name="lng_indexing_desc">Chargement de votre bibliothèque musicale…</string>
     <string name="lbl_sort_name">Nom</string>
     <string name="lbl_artist">Artiste</string>
     <string name="lbl_album">Album</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 4abf0b8bf..c1247af9c 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -23,7 +23,7 @@
 
     <string name="lbl_queue">पंक्ति</string>
     <string name="lbl_queue_add">क़तार में जोड़ें</string>
-    <string name="lbl_queue_added">कतार में जोड़ा गया</string>
+    <string name="lng_queue_added">कतार में जोड़ा गया</string>
 
     <string name="lbl_about">इसके बारे में</string>
     <string name="lbl_code">GitHub में देखें</string>
@@ -50,7 +50,7 @@
     <string name="desc_play_pause">चलाएं/रोकें</string>
 
     <!-- Hint Namespace | EditText Hints -->
-    <string name="hint_search_library">संग्रह में खोजें</string>
+    <string name="lng_search_library">संग्रह में खोजें</string>
 
     <!-- Color Label namespace | Accent names -->
 
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 88e905b7e..087359250 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="lbl_indexing">Učitavanje glazbe</string>
-    <string name="lbl_indexing_desc">Učitavam vašu zbirku glazbe…</string>
-    <string name="lbl_observing">Nadgledam zbirku glazbe</string>
-    <string name="lbl_observing_desc">Nadgledam vašu zbirku glazbe u slučaju promjena…</string>
+    <string name="lng_indexing">Učitavanje glazbe</string>
+    <string name="lng_indexing_desc">Učitavam vašu zbirku glazbe…</string>
+    <string name="lng_observing">Nadgledam zbirku glazbe</string>
+    <string name="lng_observing_desc">Nadgledam vašu zbirku glazbe u slučaju promjena…</string>
     <string name="lbl_songs">Pjesme</string>
     <string name="lbl_all_songs">Sve pjesme</string>
     <string name="lbl_albums">Albumi</string>
@@ -46,8 +46,8 @@
     <string name="lbl_size">Veličina</string>
     <string name="lbl_bitrate">Bit puls</string>
     <string name="lbl_sample_rate">Uzorak stope</string>
-    <string name="lbl_state_saved">Stanje spremljeno</string>
-    <string name="lbl_state_restored">Stanje vraćeno</string>
+    <string name="lng_state_saved">Stanje spremljeno</string>
+    <string name="lng_state_restored">Stanje vraćeno</string>
     <string name="lbl_shuffle_shortcut_short">Izmiješaj</string>
     <string name="lbl_shuffle_shortcut_long">Izmiješaj sve</string>
     <string name="lbl_ok">U redu</string>
@@ -60,7 +60,7 @@
     <string name="lbl_code">Vidi na GitHubu</string>
     <string name="lbl_faq">Često postavljana pitanja</string>
     <string name="lbl_licenses">Licencije</string>
-    <string name="lbl_author">Razvijeno sa strane OxygenCobalta</string>
+    <string name="lng_author">Razvijeno sa strane OxygenCobalta</string>
     <string name="lbl_library_counts">Statistika zbirke</string>
     <string name="set_ui">Izgled</string>
     <string name="set_theme_day">Svjetla</string>
@@ -115,7 +115,7 @@
     <string name="err_no_dirs">Nema mapa</string>
     <string name="err_bad_dir">Ova mapa nije podržana</string>
     <string name="err_did_not_restore">Nijedno stanje nije bilo moguće vratiti</string>
-    <string name="hint_search_library">Pretražite vašu zbirku…</string>
+    <string name="lng_search_library">Pretražite vašu zbirku…</string>
     <string name="desc_track_number">Zvučni zapis %d</string>
     <string name="desc_shuffle">Omogućite ili onemogućite miješanje</string>
     <string name="desc_shuffle_all">Izmiješaj sve pjesme</string>
@@ -137,8 +137,6 @@
     <string name="def_codec">Nepoznat Format</string>
     <string name="def_bitrate">Bez Bit Pulsa</string>
     <string name="def_sample_rate">Bez Stope Uzorka</string>
-    <string name="def_widget_song">Naziv Pjesme</string>
-    <string name="def_widget_artist">Ime Autora</string>
     <string name="cdc_mp3">MPEG-1 Zvuk</string>
     <string name="cdc_mp4">MPEG-4 Zvuk</string>
     <string name="cdc_ogg">Ogg Zvuk</string>
@@ -195,7 +193,7 @@
     <string name="lbl_search">Traži</string>
     <string name="lbl_filter_all">Sve</string>
     <string name="lbl_queue_add">Dodaj u red čekanja</string>
-    <string name="lbl_queue_added">Dodano u red čekanja</string>
+    <string name="lng_queue_added">Dodano u red čekanja</string>
     <string name="lbl_song_detail">Vidi svojstva</string>
     <string name="lbl_go_artist">Idi na autora</string>
     <string name="lbl_go_album">Idi na album</string>
@@ -225,6 +223,6 @@
     <string name="clr_purple">Ljubičasto</string>
     <string name="cdc_mka">Matroska Zvuk</string>
     <string name="set_wipe">Izbriši stanje reprodukcije</string>
-    <string name="lbl_state_wiped">Stanje izbrisano</string>
+    <string name="lng_state_wiped">Stanje izbrisano</string>
     <string name="set_wipe_desc">Izbriši prethodno stanje reprodukcije (ako postoji)</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 2e4c6d92a..11050d436 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -24,7 +24,7 @@
     <string name="lbl_queue">Lejátszási sor</string>
     <string name="lbl_play_next">Lejátszás következőnek</string>
     <string name="lbl_queue_add">Lejátszás sorhoz adás</string>
-    <string name="lbl_queue_added">Sorbaállítva</string>
+    <string name="lng_queue_added">Sorbaállítva</string>
 
     <string name="lbl_go_artist">Ugrás az előadóhoz</string>
     <string name="lbl_go_album">Ugrás az albumhoz</string>
@@ -55,7 +55,7 @@
     <string name="err_no_music">Nem található zene</string>
 
     <!-- Hint Namespace | EditText Hints -->
-    <string name="hint_search_library">Keresés a könyvtárban…</string>
+    <string name="lng_search_library">Keresés a könyvtárban…</string>
 
     <!-- Description Namespace | Accessibility Strings -->
     <string name="desc_track_number">Sáv %d</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index 5fdd1adc6..cdb557dec 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -19,7 +19,7 @@
     <string name="lbl_queue">Antrean</string>
     <string name="lbl_play_next">Putar selanjutnya</string>
     <string name="lbl_queue_add">Tambahkan ke antrean</string>
-    <string name="lbl_queue_added">Ditambahkan ke antrean</string>
+    <string name="lng_queue_added">Ditambahkan ke antrean</string>
     <string name="lbl_go_artist">Pergi ke artis</string>
     <string name="lbl_go_album">Pergi ke album</string>
     <string name="lbl_about">Tentang</string>
@@ -42,7 +42,7 @@
     <!-- Error Namespace | Error Labels -->
     <string name="err_no_music">Musik tidak ditemukan</string>
     <!-- Hint Namespace | EditText Hints -->
-    <string name="hint_search_library">Mencari pustaka Anda…</string>
+    <string name="lng_search_library">Mencari pustaka Anda…</string>
     <!-- Description Namespace | Accessibility Strings -->
     <string name="desc_track_number">Trek %d</string>
     <string name="desc_play_pause">Putar/Jeda</string>
@@ -73,7 +73,7 @@
     <string name="lbl_size">Ukuran</string>
     <string name="lbl_sample_rate">Tingkat sampel</string>
     <string name="set_lib_tabs">Tab Pustaka</string>
-    <string name="lbl_indexing_desc">Memuat perpustakaan musik Anda…</string>
+    <string name="lng_indexing_desc">Memuat perpustakaan musik Anda…</string>
     <string name="lbl_sort_name">Nama</string>
     <string name="lbl_artist">Artis</string>
     <string name="lbl_album">Album</string>
@@ -86,7 +86,7 @@
     <string name="lbl_sort_disc">Disk</string>
     <string name="lbl_song_detail">Lihat properti</string>
     <string name="lbl_format">Format</string>
-    <string name="lbl_author">Dikembangkan oleh OxygenCobalt</string>
+    <string name="lng_author">Dikembangkan oleh OxygenCobalt</string>
     <string name="lbl_library_counts">Statistik perpustakaan</string>
     <string name="set_show_covers_desc">Matikan untuk menghemat penggunaan memori</string>
     <string name="set_quality_covers_desc">Meningkatkan kualitas sampul album, tetapi menghasilkan waktu pemuatan yang lebih lama dan penggunaan memori yang lebih tinggi</string>
@@ -95,7 +95,7 @@
     <string name="set_alt_shuffle">Lebih suka tindakan mengacak</string>
     <string name="lbl_shuffle_shortcut_short">Acak</string>
     <string name="lbl_shuffle_shortcut_long">Acak Semua</string>
-    <string name="lbl_state_saved">Status disimpan</string>
+    <string name="lng_state_saved">Status disimpan</string>
     <string name="set_replay_gain_track">Lebih suka trek</string>
     <string name="set_replay_gain_album">Lebih suka album</string>
     <string name="set_pre_amp">Pra-amp ReplayGain</string>
@@ -160,8 +160,6 @@
     <string name="desc_skip_prev">Loncat ke lagu terakhir</string>
     <string name="desc_shuffle_all">Acak semua lagu</string>
     <string name="def_date">Tidak Ada Tanggal</string>
-    <string name="def_widget_song">Nama Lagu</string>
-    <string name="def_widget_artist">Nama Artis</string>
     <string name="set_dirs_mode_include_desc">Musik <b>hanya</b> akan dimuat dari folder yang Anda tambahkan.</string>
     <string name="err_index_failed">Pemuatan musik gagal</string>
     <string name="desc_album_cover">Sampul Album untuk %s</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 32ce32277..e1b23f750 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -31,10 +31,10 @@
     <string name="lbl_queue">Coda</string>
     <string name="lbl_play_next">Riproduci successivo</string>
     <string name="lbl_queue_add">Accoda</string>
-    <string name="lbl_queue_added">Accodato</string>
+    <string name="lng_queue_added">Accodato</string>
     <string name="lbl_go_artist">Vai all\'artista</string>
     <string name="lbl_go_album">Vai al disco</string>
-    <string name="lbl_state_saved">Stato salvato</string>
+    <string name="lng_state_saved">Stato salvato</string>
     <string name="lbl_add">Aggiungi</string>
     <string name="lbl_save">Salva</string>
     <string name="err_no_dirs">Nessuna cartella</string>
@@ -43,7 +43,7 @@
     <string name="lbl_code">Vedi su Github</string>
     <string name="lbl_faq">FAQ</string>
     <string name="lbl_licenses">Licenze</string>
-    <string name="lbl_author">Sviluppato da OxygenCobalt</string>
+    <string name="lng_author">Sviluppato da OxygenCobalt</string>
     <string name="lbl_library_counts">Statistiche libreria</string>
     <!-- Settings namespace | Settings-related labels -->
     <string name="set_title">Opzioni</string>
@@ -95,7 +95,7 @@
     <string name="err_no_app">Nessuna app può aprire il link</string>
     <string name="err_bad_dir">Questa cartella non è supportata</string>
     <!-- Hint Namespace | EditText Hints -->
-    <string name="hint_search_library">Cerca nella tua libreria…</string>
+    <string name="lng_search_library">Cerca nella tua libreria…</string>
     <!-- Description Namespace | Accessibility Strings -->
     <string name="desc_track_number">Canzone %d</string>
     <string name="desc_play_pause">Riproduci o pausa</string>
@@ -120,8 +120,6 @@
     <string name="def_date">Data sconosciuta</string>
     <string name="def_track">Numero traccia sconosciuto</string>
     <string name="def_playback">Nessuna canzone riproduzione</string>
-    <string name="def_widget_song">Nome canzone</string>
-    <string name="def_widget_artist">Nome artista</string>
     <!-- Color Label namespace | Accent names -->
     <string name="clr_red">Rosso</string>
     <string name="clr_pink">Rosa</string>
@@ -184,7 +182,7 @@
     <string name="def_sample_rate">Nessuna frequenza di campionamento</string>
     <string name="fmt_db_neg">-%.1f dB</string>
     <string name="info_indexer_channel_name">Caricamento musica</string>
-    <string name="lbl_indexing_desc">Caricamento libreria musicale…</string>
+    <string name="lng_indexing_desc">Caricamento libreria musicale…</string>
     <string name="lbl_sort_duration">Durata</string>
     <string name="lbl_sort_count">Numero canzoni</string>
     <string name="lbl_sort_disc">Disco</string>
@@ -201,11 +199,11 @@
     <string name="def_bitrate">Nessuna velocità di trasmissione</string>
     <string name="lbl_cancel">Cancella</string>
     <string name="set_pre_amp">Pre-amp ReplayGain</string>
-    <string name="lbl_observing_desc">Sto monitorando i cambiamenti nella tua libreria musicale…</string>
+    <string name="lng_observing_desc">Sto monitorando i cambiamenti nella tua libreria musicale…</string>
     <string name="set_observing_desc">Ricarica la tua libreria musicale se subisce cambiamenti (sperimentale)</string>
-    <string name="lbl_indexing">Caricamento musica</string>
-    <string name="lbl_observing">Monitoraggio libreria musicale</string>
-    <string name="lbl_state_restored">Stato ripristinato</string>
+    <string name="lng_indexing">Caricamento musica</string>
+    <string name="lng_observing">Monitoraggio libreria musicale</string>
+    <string name="lng_state_restored">Stato ripristinato</string>
     <string name="lbl_sort_date_added">Data aggiunta</string>
     <string name="set_observing">Ricaricamento automatico</string>
     <string name="set_quality_tags">Ignora tags MediaStore</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 9719fe81a..d4bae102c 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -41,12 +41,12 @@
     <string name="lbl_queue">대기열</string>
     <string name="lbl_play_next">다음 곡 재생</string>
     <string name="lbl_queue_add">대기열에 추가</string>
-    <string name="lbl_queue_added">대기열에 추가되었습니다.</string>
+    <string name="lng_queue_added">대기열에 추가되었습니다.</string>
 
     <string name="lbl_go_artist">아티스트로 이동</string>
     <string name="lbl_go_album">앨범으로 이동</string>
 
-    <string name="lbl_state_saved">상태를 저장했습니다.</string>
+    <string name="lng_state_saved">상태를 저장했습니다.</string>
 
     <!-- Actual string: Ok -->
     <string name="lbl_ok">@android:string/ok</string>
@@ -61,7 +61,7 @@
     <string name="lbl_code">Github에서 보기</string>
     <string name="lbl_faq">FAQ</string>
     <string name="lbl_licenses">라이선스</string>
-    <string name="lbl_author">OxygenCobalt 개발</string>
+    <string name="lng_author">OxygenCobalt 개발</string>
     <string name="lbl_library_counts">라이브러리 통계</string>
 
     <!-- Settings namespace | Settings-related labels -->
@@ -125,7 +125,7 @@
     <string name="err_bad_dir">이 폴더는 지원하지 않는 폴더입니다.</string>
 
     <!-- Hint Namespace | EditText Hints -->
-    <string name="hint_search_library">라이브러리에서 검색…</string>
+    <string name="lng_search_library">라이브러리에서 검색…</string>
 
     <!-- Description Namespace | Accessibility Strings -->
     <string name="desc_track_number">트랙 %d</string>
@@ -155,8 +155,6 @@
     <string name="def_date">날짜 없음</string>
     <string name="def_track">트랙 번호 없음</string>
     <string name="def_playback">재생 중인 음악 없음</string>
-    <string name="def_widget_song">음악 제목</string>
-    <string name="def_widget_artist">아티스트 이름</string>
 
     <!-- Color Label namespace | Accent names -->
     <string name="clr_red">빨간색</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index 366006835..3512244dd 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -34,7 +34,7 @@
     <string name="lbl_play">Groti</string>
     <string name="lbl_licenses">Licencijos</string>
     <string name="lbl_shuffle">Maišyti</string>
-    <string name="lbl_queue_added">Pridėta į eilę</string>
+    <string name="lng_queue_added">Pridėta į eilę</string>
     <string name="lbl_props">Dainų ypatybės</string>
     <string name="lbl_file_name">Failo pavadinimas</string>
     <string name="lbl_save">Išsaugoti</string>
@@ -55,8 +55,8 @@
     <string name="lbl_genres">Žanrai</string>
     <string name="lbl_retry">Bandykite dar kartą</string>
     <string name="lbl_grant">Suteikti</string>
-    <string name="lbl_indexing">Kraunama muzika</string>
-    <string name="lbl_indexing_desc">Kraunama jūsų muzikos biblioteka…</string>
+    <string name="lng_indexing">Kraunama muzika</string>
+    <string name="lng_indexing_desc">Kraunama jūsų muzikos biblioteka…</string>
     <string name="lbl_library_counts">Bibliotekos statistika</string>
     <string name="clr_pink">Rožinis</string>
     <string name="lbl_album">Albumas</string>
@@ -74,12 +74,12 @@
     <string name="def_artist">Nežinomas Atlikėjas</string>
     <string name="desc_no_cover">Albumo viršelis</string>
     <string name="clr_deep_purple">Tamsiai Violetinė</string>
-    <string name="lbl_observing">Stebėjimas muzikos biblioteką</string>
-    <string name="lbl_observing_desc">Stebima, ar jūsų muzikos bibliotekoje yra pakeitimų…</string>
+    <string name="lng_observing">Stebėjimas muzikos biblioteką</string>
+    <string name="lng_observing_desc">Stebima, ar jūsų muzikos bibliotekoje yra pakeitimų…</string>
     <string name="lbl_shuffle_shortcut_short">Išmaišyti</string>
     <string name="lbl_shuffle_shortcut_long">Išmaišyti viską</string>
-    <string name="lbl_state_restored">Atkurta grojimo būsena</string>
-    <string name="lbl_state_saved">Išsaugota grojamo būsena</string>
+    <string name="lng_state_restored">Atkurta grojimo būsena</string>
+    <string name="lng_state_saved">Išsaugota grojamo būsena</string>
     <string name="lbl_cancel">\@android:string/atšaukti</string>
     <string name="lbl_code">Peržiūrėti per „Github“</string>
     <string name="set_display">Rodyti</string>
@@ -98,7 +98,6 @@
     <string name="set_round_mode">Apvalus režimas</string>
     <string name="set_alt_action">Naudoti alternatyvų pranešimo veiksmą</string>
     <string name="cdc_mp3">MPEG-1 Garsas</string>
-    <string name="def_widget_artist">Atlikėjo Vardas</string>
     <string name="clr_green">Žalia</string>
     <string name="clr_deep_green">Tamsiai Žalia</string>
     <string name="clr_lime">Kalkės</string>
@@ -111,7 +110,6 @@
     <string name="lbl_remix_group">Remiksai</string>
     <string name="clr_teal">Arbatžolė</string>
     <string name="clr_yellow">Geltona</string>
-    <string name="def_widget_song">Dainos Pavadinimas</string>
     <string name="cdc_aac">Išplėstinis Garso Kodavimas (AAC)</string>
     <string name="cdc_flac">Nemokamas Be Nuostolių Garso Kodekas (FLAC)</string>
     <plurals name="fmt_song_count">
@@ -133,7 +131,7 @@
     <string name="lbl_live_group">Gyvai</string>
     <string name="set_headset_autoplay_desc">Visada pradėta groti, kai prijungtos ausinės (gali veikti ne visuose įrenginiuose)</string>
     <string name="cdc_ogg">Ogg Garsas</string>
-    <string name="lbl_author">Sukūrė OxygenCobalt</string>
+    <string name="lng_author">Sukūrė OxygenCobalt</string>
     <string name="set_replay_gain_track">Pageidaujamas takelis</string>
     <string name="err_no_dirs">Jokių aplankų</string>
     <string name="err_bad_dir">Šis aplankas nepalaikomas</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 6817c1499..d88181eca 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -26,10 +26,10 @@
     <string name="lbl_queue">Wachtrij</string>
     <string name="lbl_play_next">Afspelen als volgende</string>
     <string name="lbl_queue_add">Toevoegen aan wachtrij</string>
-    <string name="lbl_queue_added">Toegevoegd aan de wachtrij</string>
+    <string name="lng_queue_added">Toegevoegd aan de wachtrij</string>
     <string name="lbl_go_artist">Ga naar artiest</string>
     <string name="lbl_go_album">Ga naar album</string>
-    <string name="lbl_state_saved">Staat gered</string>
+    <string name="lng_state_saved">Staat gered</string>
     <string name="lbl_add">Toevoegen</string>
     <string name="lbl_save">Opslaan</string>
     <string name="err_no_dirs">Geen Mappen</string>
@@ -38,7 +38,7 @@
     <string name="lbl_code">Bekijken op GitHub</string>
     <string name="lbl_faq">FAQ</string>
     <string name="lbl_licenses">Licenties</string>
-    <string name="lbl_author">Ontwikkeld door OxygenCobalt</string>
+    <string name="lng_author">Ontwikkeld door OxygenCobalt</string>
     <!-- Settings namespace | Settings-related labels -->
     <string name="set_title">Instellingen</string>
     <string name="set_ui">Uiterlijk</string>
@@ -72,7 +72,7 @@
     <string name="err_no_app">Geen app kan deze link openen</string>
     <string name="err_bad_dir">Deze map wordt niet ondersteund</string>
     <!-- Hint Namespace | EditText Hints -->
-    <string name="hint_search_library">Zoek in uw bibliotheek…</string>
+    <string name="lng_search_library">Zoek in uw bibliotheek…</string>
     <!-- Description Namespace | Accessibility Strings -->
     <string name="desc_track_number">Nummer %d</string>
     <string name="desc_play_pause">Afspelen/Pauzeren</string>
@@ -147,7 +147,6 @@
     <string name="lbl_off">Uit</string>
     <string name="set_headset_autoplay_desc">Altijd beginnen met spelen als een headset is aangesloten (werkt mogelijk niet op alle apparaten)</string>
     <string name="desc_shuffle">Schakel shuffle aan of uit</string>
-    <string name="def_widget_song">Naam van het lied</string>
     <string name="set_reindex_desc">Kan afspeelstatus wissen</string>
     <string name="fmt_indexing">Uw muziekbibliotheek wordt geladen… (%1$d/%2$d)</string>
     <string name="set_dirs_mode_exclude">Uitgezonderd</string>
@@ -164,8 +163,7 @@
     <string name="set_detail_song_playback_mode">Bij het afspelen van item details</string>
     <string name="set_round_mode">Ronde modus</string>
     <string name="set_round_mode_desc">Afgeronde hoeken op extra UI-elementen inschakelen (vereist dat albumhoezen afgerond zijn)</string>
-    <string name="def_widget_artist">Naam artiest</string>
-    <string name="lbl_state_restored">Staat gerestaureerd</string>
+    <string name="lng_state_restored">Staat gerestaureerd</string>
     <string name="lbl_library_counts">Bibliotheekstatistieken</string>
     <string name="set_lib_tabs_desc">Verander de zichtbaarheid en volgorde van bibliotheek-tabbladen</string>
     <string name="set_headset_autoplay">Headset automatisch afspelen</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 83339a907..f0b58a19d 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -24,7 +24,7 @@
     <string name="lbl_queue">Kolejka</string>
     <string name="lbl_play_next">Odtwarzaj następny</string>
     <string name="lbl_queue_add">Dodaj do kolejki</string>
-    <string name="lbl_queue_added">Dodany do kolejki</string>
+    <string name="lng_queue_added">Dodany do kolejki</string>
 
     <string name="lbl_go_artist">Przejdź do wykonawcy</string>
     <string name="lbl_go_album">Przejdź do albumu</string>
@@ -60,7 +60,7 @@
     <string name="desc_play_pause">Odtwarzanie/Pauza</string>
 
     <!-- Hint Namespace | EditText Hints -->
-    <string name="hint_search_library">Szukaj w bibliotece…</string>
+    <string name="lng_search_library">Szukaj w bibliotece…</string>
 
     <!-- Color Label namespace | Accent names -->
     <string name="clr_red">Czerwony</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index b69a0040c..2d58a251b 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -18,7 +18,7 @@
     <string name="lbl_queue">Fila</string>
     <string name="lbl_play_next">Reproduzir próxima</string>
     <string name="lbl_queue_add">Adicionar à fila</string>
-    <string name="lbl_queue_added">Adicionada à fila</string>
+    <string name="lng_queue_added">Adicionada à fila</string>
     <string name="lbl_go_artist">Ir para o artista</string>
     <string name="lbl_go_album">Ir para o álbum</string>
     <string name="lbl_about">Sobre</string>
@@ -26,7 +26,7 @@
     <string name="lbl_code">Ver no GitHub</string>
     <string name="lbl_faq">FAQ</string>
     <string name="lbl_licenses">Licenças</string>
-    <string name="lbl_author">Desenvolvido por OxygenCobalt</string>
+    <string name="lng_author">Desenvolvido por OxygenCobalt</string>
     <!-- Settings namespace | Settings-related labels -->
     <string name="set_title">Configurações</string>
     <string name="set_ui">Aparência</string>
@@ -45,7 +45,7 @@
     <string name="desc_track_number">Música %d</string>
     <string name="desc_play_pause">Reproduzir/Pausar</string>
     <!-- Hint Namespace | EditText Hints -->
-    <string name="hint_search_library">Pesquise na sua biblioteca…</string>
+    <string name="lng_search_library">Pesquise na sua biblioteca…</string>
     <!-- Color Label namespace | Accent names -->
     <string name="clr_red">Vermelho</string>
     <string name="clr_pink">Rosa</string>
@@ -101,7 +101,7 @@
     <string name="set_dirs_mode">Modo</string>
     <string name="err_no_perms">O Auxio precisa de permissão para ler sua biblioteca de músicas</string>
     <string name="info_app_desc">Um leitor de música simples e racional para android.</string>
-    <string name="lbl_indexing_desc">Carregando sua biblioteca de músicas…</string>
+    <string name="lng_indexing_desc">Carregando sua biblioteca de músicas…</string>
     <string name="lbl_sort_year">Ano</string>
     <string name="lbl_sort_duration">Duração</string>
     <string name="lbl_sort_count">Contagem de Músicas</string>
@@ -115,7 +115,7 @@
     <string name="lbl_size">Tamanho</string>
     <string name="lbl_bitrate">Taxa de bits</string>
     <string name="lbl_sample_rate">Taxa de amostragem</string>
-    <string name="lbl_state_saved">Estado salvo</string>
+    <string name="lng_state_saved">Estado salvo</string>
     <string name="set_lib_tabs_desc">Altere a visibilidade e a ordem das guias da biblioteca</string>
     <string name="set_black_mode">Tema preto</string>
     <string name="set_black_mode_desc">Use um tema escuro puro preto</string>
@@ -148,8 +148,6 @@
     <string name="desc_genre_image">Imagem de Gênero para %s</string>
     <string name="def_artist">Artista Desconhecido</string>
     <string name="def_sample_rate">Sem Taxa de Amostragem</string>
-    <string name="def_widget_song">Nome da Música</string>
-    <string name="def_widget_artist">Nome do Artista</string>
     <string name="cdc_mp3">Áudio MPEG-1</string>
     <string name="cdc_mp4">Áudio MPEG-4</string>
     <string name="cdc_ogg">Áudio Ogg</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index a300a8301..72efabfef 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -24,7 +24,7 @@
     <string name="lbl_queue">Fila</string>
     <string name="lbl_play_next">Reproduzir a próxima</string>
     <string name="lbl_queue_add">Adicionar à fila</string>
-    <string name="lbl_queue_added">Adicionada à fila</string>
+    <string name="lng_queue_added">Adicionada à fila</string>
 
     <string name="lbl_go_artist">Ir para o artista</string>
     <string name="lbl_go_album">Ir para o álbum</string>
@@ -34,7 +34,7 @@
     <string name="lbl_code">Ver no GitHub</string>
     <string name="lbl_faq">FAQ</string>
     <string name="lbl_licenses">Licenças</string>
-    <string name="lbl_author">Desenvolvido por OxygenCobalt</string>
+    <string name="lng_author">Desenvolvido por OxygenCobalt</string>
 
     <!-- Settings namespace | Settings-related labels -->
     <string name="set_title">Definições</string>
@@ -62,7 +62,7 @@
     <string name="desc_play_pause">Reproduzir/Pausar</string>
 
     <!-- Hint Namespace | EditText Hints -->
-    <string name="hint_search_library">Procurar na biblioteca…</string>
+    <string name="lng_search_library">Procurar na biblioteca…</string>
 
     <!-- Color Label namespace | Accent names -->
     <string name="clr_red">Vermelho</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index 8fd40d564..b44d56fc0 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -24,7 +24,7 @@
     <string name="lbl_queue">Fila de așteptare</string>
     <string name="lbl_play_next">Redaţi următoarea</string>
     <string name="lbl_queue_add">Adăugați la lista de așteptare</string>
-    <string name="lbl_queue_added">A fost adăugat la liste de așteptare</string>
+    <string name="lng_queue_added">A fost adăugat la liste de așteptare</string>
 
     <string name="lbl_go_artist">Accesaţi artistul</string>
     <string name="lbl_go_album">Accesaţi albumul</string>
@@ -34,7 +34,7 @@
     <string name="lbl_code">Vedeți pe GitHub</string>
     <string name="lbl_faq">FAQ</string>
     <string name="lbl_licenses">Licențe</string>
-    <string name="lbl_author">Dezvoltat de OxygenCobalt</string>
+    <string name="lng_author">Dezvoltat de OxygenCobalt</string>
 
     <!-- Settings namespace | Settings-related labels -->
     <string name="set_title">Setări</string>
@@ -56,7 +56,7 @@
     <string name="err_no_music">Nu s-a găsit nici o muzică</string>
 
     <!-- Hint Namespace | EditText Hints -->
-    <string name="hint_search_library">Căutați în bibliotecă…</string>
+    <string name="lng_search_library">Căutați în bibliotecă…</string>
 
     <!-- Description Namespace | Accessibility Strings -->
     <string name="desc_track_number">Melodie %d</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 3800f3aea..1987590bd 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -31,10 +31,10 @@
     <string name="lbl_queue">Очередь</string>
     <string name="lbl_play_next">Играть далее</string>
     <string name="lbl_queue_add">Добавить в очередь</string>
-    <string name="lbl_queue_added">Добавлено в очередь</string>
+    <string name="lng_queue_added">Добавлено в очередь</string>
     <string name="lbl_go_artist">Перейти к исполнителю</string>
     <string name="lbl_go_album">Перейти к альбому</string>
-    <string name="lbl_state_saved">Позиция сохранена</string>
+    <string name="lng_state_saved">Позиция сохранена</string>
     <string name="lbl_add">Добавить</string>
     <string name="lbl_save">Сохранить</string>
     <string name="err_no_dirs">Папок нет</string>
@@ -43,7 +43,7 @@
     <string name="lbl_code">Страница на GitHub</string>
     <string name="lbl_faq">FAQ</string>
     <string name="lbl_licenses">Лицензии</string>
-    <string name="lbl_author">Разработчик: OxygenCobalt</string>
+    <string name="lng_author">Разработчик: OxygenCobalt</string>
     <!-- Settings namespace | Settings-related labels -->
     <string name="set_title">Настройки</string>
     <string name="set_ui">Внешний вид</string>
@@ -94,7 +94,7 @@
     <string name="err_no_app">Нет приложений для открытия данной ссылки</string>
     <string name="err_bad_dir">Эта папка не поддерживается</string>
     <!-- Hint Namespace | EditText Hints -->
-    <string name="hint_search_library">Найти в библиотеке…</string>
+    <string name="lng_search_library">Найти в библиотеке…</string>
     <!-- Description Namespace | Accessibility Strings -->
     <string name="desc_track_number">Трек %d</string>
     <string name="desc_play_pause">Играть или остановить</string>
@@ -118,8 +118,6 @@
     <string name="def_genre">Неизвестный жанр</string>
     <string name="def_date">Дата отсутствует</string>
     <string name="def_playback">Музыка не играет</string>
-    <string name="def_widget_song">Название трека</string>
-    <string name="def_widget_artist">Имя исполнителя</string>
     <!-- Color Label namespace | Accent names -->
     <string name="clr_red">Красный</string>
     <string name="clr_pink">Розовый</string>
@@ -152,9 +150,9 @@
         <item quantity="other">%d альбомы</item>
     </plurals>
     <string name="info_indexer_channel_name">Музыка загружается</string>
-    <string name="lbl_indexing">Загрузка музыки</string>
-    <string name="lbl_indexing_desc">Загрузка музыкальной библиотеки…</string>
-    <string name="lbl_observing">Мониторинг музыкальной библиотеки</string>
+    <string name="lng_indexing">Загрузка музыки</string>
+    <string name="lng_indexing_desc">Загрузка музыкальной библиотеки…</string>
+    <string name="lng_observing">Мониторинг музыкальной библиотеки</string>
     <string name="lbl_shuffle_shortcut_short">Перемешать</string>
     <string name="lbl_shuffle_shortcut_long">Перемешать все</string>
     <string name="lbl_ok">\@android:string/ok</string>
@@ -164,7 +162,7 @@
     <string name="lbl_bitrate">Битрейт</string>
     <string name="lbl_sort_disc">Диск</string>
     <string name="lbl_sort_track">Трек</string>
-    <string name="lbl_state_restored">Состояние восстановлено</string>
+    <string name="lng_state_restored">Состояние восстановлено</string>
     <string name="lbl_cancel">\@android:string/cancel</string>
     <string name="set_pre_amp_warning">Внимание: Изменение предусилителя на большое положительное значение может привести к появлению пиков на некоторых звуковых дорожках.</string>
     <string name="lbl_song_detail">Свойства</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index b9d2a6ac4..4bcf35be9 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -19,7 +19,7 @@
     <string name="lbl_queue">Kuyruk</string>
     <string name="lbl_play_next">Sonraki şarkı</string>
     <string name="lbl_queue_add">Kuyruğa ekle</string>
-    <string name="lbl_queue_added">Kuyruğa eklendi</string>
+    <string name="lng_queue_added">Kuyruğa eklendi</string>
     <string name="lbl_go_artist">Sanatçıya git</string>
     <string name="lbl_go_album">Albüme git</string>
     <string name="lbl_about">Hakkında</string>
@@ -41,7 +41,7 @@
     <!-- Error Namespace | Error Labels -->
     <string name="err_no_music">Müzik bulunamadı</string>
     <!-- Hint Namespace | EditText Hints -->
-    <string name="hint_search_library">Kitaplığınız taranıyor…</string>
+    <string name="lng_search_library">Kitaplığınız taranıyor…</string>
     <!-- Description Namespace | Accessibility Strings -->
     <string name="desc_track_number">Parça %d</string>
     <string name="desc_play_pause">Başlat/Durdur</string>
@@ -76,15 +76,15 @@
     <string name="info_widget_desc">Müzik çalmayı görüntüle ve kontrol et</string>
     <string name="info_app_desc">Android için basit, rasyonel bir müzik çalar.</string>
     <string name="info_indexer_channel_name">Müzik Yükleniyor</string>
-    <string name="lbl_indexing_desc">Müzik kitaplığınız yükleniyor…</string>
+    <string name="lng_indexing_desc">Müzik kitaplığınız yükleniyor…</string>
     <string name="lbl_sort_name">İsim</string>
     <string name="lbl_artist">Sanatçı</string>
     <string name="lbl_album">Albüm</string>
     <string name="lbl_sort_year">Yıl</string>
     <string name="lbl_sort_duration">Süre</string>
     <string name="lbl_off">Kapalı</string>
-    <string name="lbl_state_saved">Durum kaydedildi</string>
-    <string name="lbl_author">OxygenCobalt tarafından geliştirildi</string>
+    <string name="lng_state_saved">Durum kaydedildi</string>
+    <string name="lng_author">OxygenCobalt tarafından geliştirildi</string>
     <string name="set_black_mode">Siyah tema</string>
     <string name="lbl_library_counts">Kitaplık istatistikleri</string>
     <string name="set_black_mode_desc">Saf siyah koyu tema kullan</string>
@@ -133,8 +133,6 @@
     <string name="desc_genre_image">%s için Tür Resmi</string>
     <string name="def_genre">Bilinmeyen tür</string>
     <string name="def_artist">Bilinmeyen sanatçı</string>
-    <string name="def_widget_song">Şarkı Adı</string>
-    <string name="def_widget_artist">Sanatçı Adı</string>
     <string name="cdc_mp3">MPEG-1 Ses</string>
     <string name="cdc_mp4">MPEG-4 Ses</string>
     <string name="cdc_ogg">Ogg Ses</string>
@@ -193,7 +191,7 @@
     <string name="clr_cyan">Camgöbeği</string>
     <string name="clr_teal">Deniz mavisi</string>
     <string name="set_round_mode_desc">Ek arayüz öğelerinde yuvarlatılmış köşeleri etkinleştirir (Albüm kapaklarının yuvarlatılmış olmasını gerektirir)</string>
-    <string name="lbl_state_restored">Durum geri yüklendi</string>
+    <string name="lng_state_restored">Durum geri yüklendi</string>
     <string name="set_restore_desc">Önceden kaydedilmiş oynatma durumunu geri getirir (varsa)</string>
     <string name="set_round_mode">Yuvarlak mod</string>
     <string name="set_restore">Oynatma durumunu eski haline getir</string>
@@ -201,9 +199,9 @@
     <string name="set_quality_tags_desc">Etiket kalitesini artırır, ancak daha uzun yükleme süreleri gerektirir</string>
     <string name="err_did_not_restore">Hiçbir durum geri getirelemedi</string>
     <string name="set_repeat_pause">Tekrarda duraklat</string>
-    <string name="lbl_indexing">Müzik yükleniyor</string>
-    <string name="lbl_observing">Müzik kitaplığı denetleniyor</string>
-    <string name="lbl_observing_desc">Müzik kitaplığı değişiklikler için denetleniyor…</string>
+    <string name="lng_indexing">Müzik yükleniyor</string>
+    <string name="lng_observing">Müzik kitaplığı denetleniyor</string>
+    <string name="lng_observing_desc">Müzik kitaplığı değişiklikler için denetleniyor…</string>
     <string name="set_observing">Otomatik yeniden yükleme</string>
     <string name="set_observing_desc">Müzik kitaplığınız her değiştiğinde yeniden yükler (Deneysel)</string>
     <string name="lbl_sort_date_added">Eklendiği tarih</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index 04a797ef3..5149a8a5e 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -23,7 +23,7 @@
     <string name="lbl_queue">Черга</string>
     <string name="lbl_play_next">Відтворити наступною</string>
     <string name="lbl_queue_add">Додати в чергу</string>
-    <string name="lbl_queue_added">Додана в чергу</string>
+    <string name="lng_queue_added">Додана в чергу</string>
 
     <string name="lbl_go_artist">Перейти до виконавця</string>
     <string name="lbl_go_album">Перейти до альбому</string>
@@ -52,7 +52,7 @@
     <string name="err_no_music">Музику не знайдено</string>
 
     <!-- Hint Namespace | EditText Hints -->
-    <string name="hint_search_library">Пошук бібліотеки…</string>
+    <string name="lng_search_library">Пошук бібліотеки…</string>
 
     <!-- Description Namespace | Accessibility Strings -->
     <string name="desc_track_number">Доріжка %d</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 5b45f5d8e..4a1b657ed 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -31,10 +31,10 @@
     <string name="lbl_queue">播放队列</string>
     <string name="lbl_play_next">作为下一首播放</string>
     <string name="lbl_queue_add">加入播放队列</string>
-    <string name="lbl_queue_added">已加入播放队列</string>
+    <string name="lng_queue_added">已加入播放队列</string>
     <string name="lbl_go_artist">查看艺术家</string>
     <string name="lbl_go_album">查看专辑</string>
-    <string name="lbl_state_saved">已保存播放进度</string>
+    <string name="lng_state_saved">已保存播放进度</string>
     <string name="lbl_add">添加</string>
     <string name="lbl_save">保存</string>
     <string name="err_no_dirs">没有任何文件夹</string>
@@ -43,7 +43,7 @@
     <string name="lbl_code">在 Github 上查看</string>
     <string name="lbl_faq">FAQ</string>
     <string name="lbl_licenses">许可证</string>
-    <string name="lbl_author">由 OxygenCobalt 开发</string>
+    <string name="lng_author">由 OxygenCobalt 开发</string>
     <!-- Settings namespace | Settings-related labels -->
     <string name="set_title">设置</string>
     <string name="set_ui">外观</string>
@@ -94,7 +94,7 @@
     <string name="err_no_app">没有可以打开该链接的应用</string>
     <string name="err_bad_dir">该目录不受支持</string>
     <!-- Hint Namespace | EditText Hints -->
-    <string name="hint_search_library">在曲库中搜索…</string>
+    <string name="lng_search_library">在曲库中搜索…</string>
     <!-- Description Namespace | Accessibility Strings -->
     <string name="desc_track_number">第 %d 首曲目</string>
     <string name="desc_play_pause">播放或暂停</string>
@@ -119,8 +119,6 @@
     <string name="def_date">没有日期</string>
     <string name="def_track">无曲目编号</string>
     <string name="def_playback">未播放音乐</string>
-    <string name="def_widget_song">歌曲名称</string>
-    <string name="def_widget_artist">艺术家姓名</string>
     <!-- Color Label namespace | Accent names -->
     <string name="clr_red">红色</string>
     <string name="clr_pink">粉色</string>
@@ -184,7 +182,7 @@
     <string name="fmt_lib_album_count">已加载专辑数量：%d</string>
     <string name="def_sample_rate">没有采样率信息</string>
     <string name="info_indexer_channel_name">音乐加载中</string>
-    <string name="lbl_indexing_desc">正在加载您的音乐库……</string>
+    <string name="lng_indexing_desc">正在加载您的音乐库……</string>
     <string name="lbl_sort_disc">碟片</string>
     <string name="lbl_sort_duration">时长</string>
     <string name="lbl_sort_count">歌曲计数</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 3d1399a62..2931085c3 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -24,7 +24,7 @@
     <string name="lbl_queue">隊列</string>
     <string name="lbl_play_next">下一首播放</string>
     <string name="lbl_queue_add">添加到隊列</string>
-    <string name="lbl_queue_added">已加入隊列</string>
+    <string name="lng_queue_added">已加入隊列</string>
 
     <string name="lbl_go_artist">前往該歌手頁面</string>
     <string name="lbl_go_album">專輯</string>
@@ -60,7 +60,7 @@
     <string name="desc_play_pause">播放/暫停</string>
 
     <!-- Hint Namespace | EditText Hints -->
-    <string name="hint_search_library">搜尋音樂庫…</string>
+    <string name="lng_search_library">搜尋音樂庫…</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
     <plurals name="fmt_song_count">
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2578f923a..04f016d91 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,23 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- Info namespace | App labels -->
+    <eat-comment />
+
     <string name="info_app_desc">A simple, rational music player for android.</string>
     <string name="info_playback_channel_name">Music playback</string>
     <string name="info_indexer_channel_name">Music loading</string>
     <string name="info_widget_desc">View and control music playback</string>
 
     <!-- Label Namespace | Static Labels -->
+    <eat-comment />
 
     <string name="lbl_retry">Retry</string>
     <!-- As in grant permission -->
     <string name="lbl_grant">Grant</string>
-    <string name="lbl_indexing">Loading music</string>
-    <string name="lbl_indexing_desc">Loading your music library…</string>
-    <string name="lbl_observing">Monitoring music library</string>
-    <string name="lbl_observing_desc">Monitoring your music library for changes…</string>
 
     <string name="lbl_songs">Songs</string>
-    <string name="lbl_all_songs">All Songs</string>
+    <string name="lbl_all_songs">All songs</string>
 
     <string name="lbl_albums">Albums</string>
     <string name="lbl_album">Album</string>
@@ -76,14 +75,13 @@
     <string name="lbl_sort_date_added">Date added</string>
     <string name="lbl_sort_asc">Ascending</string>
 
-    <string name="lbl_playback">Now Playing</string>
+    <string name="lbl_playback">Now playing</string>
     <string name="lbl_play">Play</string>
     <string name="lbl_shuffle">Shuffle</string>
 
     <string name="lbl_queue">Queue</string>
     <string name="lbl_play_next">Play next</string>
     <string name="lbl_queue_add">Add to queue</string>
-    <string name="lbl_queue_added">Added to queue</string>
 
     <string name="lbl_go_artist">Go to artist</string>
     <string name="lbl_go_album">Go to album</string>
@@ -99,17 +97,10 @@
     <string name="lbl_bitrate">Bit rate</string>
     <string name="lbl_sample_rate">Sample rate</string>
 
-    <!-- Referring to playback state -->
-    <string name="lbl_state_saved">State saved</string>
-    <!-- Referring to playback state -->
-    <string name="lbl_state_wiped">State cleared</string>
-    <!-- Referring to playback state -->
-    <string name="lbl_state_restored">State restored</string>
-
     <!-- Limit to 10 characters -->
     <string name="lbl_shuffle_shortcut_short">Shuffle</string>
     <!-- Limit to 25 characters -->
-    <string name="lbl_shuffle_shortcut_long">Shuffle All</string>
+    <string name="lbl_shuffle_shortcut_long">Shuffle all</string>
 
     <!-- Actual string: Ok -->
     <string name="lbl_ok">@android:string/ok</string>
@@ -121,13 +112,31 @@
 
     <string name="lbl_about">About</string>
     <string name="lbl_version">Version</string>
-    <string name="lbl_code">View on Github</string>
+    <string name="lbl_code">Source code</string>
     <string name="lbl_faq">FAQ</string>
     <string name="lbl_licenses">Licenses</string>
-    <string name="lbl_author">Developed by OxygenCobalt</string>
     <string name="lbl_library_counts">Library statistics</string>
 
+    <!-- Long Namespace | Longer Descriptions -->
+    <eat-comment />
+
+    <string name="lng_indexing">Loading music</string>
+    <string name="lng_indexing_desc">Loading your music library…</string>
+    <string name="lng_observing">Monitoring music library</string>
+    <string name="lng_observing_desc">Monitoring your music library for changes…</string>
+    <string name="lng_queue_added">Added to queue</string>
+    <string name="lng_author">Developed by OxygenCobalt</string>
+    <!-- As in music library -->
+    <string name="lng_search_library">Search your library…</string>
+    <!-- Referring to playback state -->
+    <string name="lng_state_saved">State saved</string>
+    <!-- Referring to playback state -->
+    <string name="lng_state_wiped">State cleared</string>
+    <!-- Referring to playback state -->
+    <string name="lng_state_restored">State restored</string>
+
     <!-- Settings namespace | Settings-related labels -->
+    <eat-comment />
 
     <string name="set_title">Settings</string>
     <string name="set_ui">Appearance</string>
@@ -210,21 +219,16 @@
     <string name="err_no_perms">Auxio needs permission to read your music library</string>
     <string name="err_no_app">No app can open this link</string>
     <!-- No folders in the "Music Folders" setting -->
-    <string name="err_no_dirs">No Folders</string>
+    <string name="err_no_dirs">No folders</string>
     <string name="err_bad_dir">This folder is not supported</string>
     <!-- Referring to playback state -->
     <string name="err_did_not_restore">No state could be restored</string>
 
-    <!-- Hint Namespace | EditText Hints -->
-
-    <!-- As in music library -->
-    <string name="hint_search_library">Search your library…</string>
-
     <!-- Description Namespace | Accessibility Strings -->
 
     <string name="desc_track_number">Track %d</string>
 
-    <string name="desc_play_pause">Play or Pause</string>
+    <string name="desc_play_pause">Play or pause</string>
     <string name="desc_skip_next">Skip to next song</string>
     <string name="desc_skip_prev">Skip to last song</string>
     <string name="desc_change_repeat">Change repeat mode</string>
@@ -245,46 +249,47 @@
     <string name="desc_genre_image">Genre image for %s</string>
 
     <!-- Default Namespace | Placeholder values -->
+    <eat-comment />
 
-    <string name="def_artist">Unknown Artist</string>
-    <string name="def_genre">Unknown Genre</string>
-    <string name="def_date">No Date</string>
-    <string name="def_track">No Track Number</string>
+    <string name="def_artist">Unknown artist</string>
+    <string name="def_genre">Unknown genre</string>
+    <string name="def_date">No date</string>
+    <string name="def_track">No track number</string>
     <string name="def_playback">No music playing</string>
-    <string name="def_codec">Unknown Format</string>
-    <string name="def_bitrate">No Bitrate</string>
-    <string name="def_sample_rate">No Sample Rate</string>
-    <string name="def_widget_song">Song Name</string>
-    <string name="def_widget_artist">Artist Name</string>
+    <string name="def_codec">Unknown format</string>
+    <string name="def_bitrate">No bitrate</string>
+    <string name="def_sample_rate">No sample rate</string>
 
     <!-- Codec Namespace | Format names -->
+    <eat-comment />
 
     <!-- "Audio" can optionally be translated -->
-    <string name="cdc_mp3">MPEG-1 Audio</string>
+    <string name="cdc_mp3">MPEG-1 audio</string>
     <!-- "Audio" can optionally be translated -->
-    <string name="cdc_mp4">MPEG-4 Audio</string>
+    <string name="cdc_mp4">MPEG-4 audio</string>
     <!-- "Audio" can optionally be translated -->
-    <string name="cdc_ogg">Ogg Audio</string>
+    <string name="cdc_ogg">Ogg audio</string>
     <!-- "Audio" can optionally be translated -->
-    <string name="cdc_mka">Matroska Audio</string>
+    <string name="cdc_mka">Matroska audio</string>
     <!-- "Advanced Audio Coding" can optionally be translated -->
     <string name="cdc_aac">Advanced Audio Coding (AAC)</string>
     <!-- "Free Lossless Audio Codec" can optionally be translated -->
     <string name="cdc_flac">Free Lossless Audio Codec (FLAC)</string>
 
     <!-- Color Label namespace | Accent names -->
+    <eat-comment />
 
     <string name="clr_red">Red</string>
     <string name="clr_pink">Pink</string>
     <string name="clr_purple">Purple</string>
-    <string name="clr_deep_purple">Deep Purple</string>
+    <string name="clr_deep_purple">Deep purple</string>
     <string name="clr_indigo">Indigo</string>
     <string name="clr_blue">Blue</string>
-    <string name="clr_deep_blue">Deep Blue</string>
+    <string name="clr_deep_blue">Deep blue</string>
     <string name="clr_cyan">Cyan</string>
     <string name="clr_teal">Teal</string>
     <string name="clr_green">Green</string>
-    <string name="clr_deep_green">Deep Green</string>
+    <string name="clr_deep_green">Deep green</string>
     <string name="clr_lime">Lime</string>
     <string name="clr_yellow">Yellow</string>
     <string name="clr_orange">Orange</string>
@@ -294,6 +299,7 @@
     <string name="clr_dynamic">Dynamic</string>
 
     <!-- Format Namespace | Value formatting/plurals -->
+    <eat-comment />
 
     <!-- As in "Disc 1", "Disc 2", etc. in a set -->
     <string name="fmt_disc_no">Disc %d</string>
@@ -317,12 +323,12 @@
     <string name="fmt_lib_total_duration">Total duration: %s</string>
 
     <plurals name="fmt_song_count">
-        <item quantity="one">%d Song</item>
-        <item quantity="other">%d Songs</item>
+        <item quantity="one">%d song</item>
+        <item quantity="other">%d songs</item>
     </plurals>
 
     <plurals name="fmt_album_count">
-        <item quantity="one">%d Album</item>
-        <item quantity="other">%d Albums</item>
+        <item quantity="one">%d album</item>
+        <item quantity="other">%d albums</item>
     </plurals>
 </resources>
\ No newline at end of file