aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2016-02-04 18:39:12 -0800
committerScott Jackson <daneren2005@gmail.com>2016-02-04 18:39:12 -0800
commitfc39ef2c72abcdde0ab7a567fdfcecd04844ae35 (patch)
tree8cb3a60c547a3b99aa47190d34c88a8ab28e7957 /app/src/main/res
parentd5fb794717317a641321641b9b63705e7eea3eb6 (diff)
parent62aa673906cc6ecb1d5b19262ab2d918cd8f1b6d (diff)
downloaddsub-fc39ef2c72abcdde0ab7a567fdfcecd04844ae35.tar.gz
dsub-fc39ef2c72abcdde0ab7a567fdfcecd04844ae35.tar.bz2
dsub-fc39ef2c72abcdde0ab7a567fdfcecd04844ae35.zip
Merge branch 'music-folders'
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/values/strings.xml2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 174e6588..6eac3c83 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -531,6 +531,8 @@
<string name="admin.delete_user_error">Failed to delete %1$s</string>
<string name="admin.confirm_password">Confirm Password</string>
<string name="admin.confirm_password_bad">Entered password is wrong</string>
+ <string name="admin.permissions">Permissions</string>
+ <string name="admin.musicFolders">Music Folders</string>
<string name="admin.scrobblingEnabled">Scrobbling allowed</string>
<string name="admin.role.admin">Administrator</string>