Merge scrobble to master

2021-09-09 18:01:32 +10:00
parent c25e5848cf 67bd25496e
commit c4c0aa00c6
8 changed files with 137 additions and 16 deletions
--- a/resources/language/English/strings.po
+++ b/resources/language/English/strings.po
@ -173,3 +173,6 @@ msgctxt "#30043"
 msgid "Merge album folders"
 msgstr ""

+msgctxt "#30044"
+msgid "Scrobble to Last.FM"
+msgstr ""
--- a/resources/language/French/strings.po
+++ b/resources/language/French/strings.po
@ -172,3 +172,7 @@ msgstr ""
 msgctxt "#30043"
 msgid "Merge album folders"
 msgstr ""
+
+msgctxt "#30044"
+msgid "Scrobble to Last.FM"
+msgstr ""
--- a/resources/language/German/strings.po
+++ b/resources/language/German/strings.po
@ -171,3 +171,7 @@ msgstr ""
 msgctxt "#30043"
 msgid "Merge album folders"
 msgstr ""
+
+msgctxt "#30044"
+msgid "Scrobble to Last.FM"
+msgstr ""
--- a/resources/settings.xml
+++ b/resources/settings.xml
@ -26,7 +26,12 @@
 		<setting label="30041" id="legacyauth" type="bool" default="false" />
        <setting label="30017" type="lsep" />
        <setting label="30018" id="cachetime" type="labelenum"  default="3600" values="1|5|15|30|60|120|180|720|1440|3600"/>
+<<<<<<< HEAD
        <setting label="30043" id="merge" type="bool" default="true" />
+=======
+        <setting label="30043" id="merge" type="bool" default="false" />
+        <setting label="30044" id="scrobble" type="bool" default="false" />
+>>>>>>> scrobble
 		
 	</category>
 </settings>