Merge pull request #505 from a93h/master

Update Changelog and Readme.md
simple-last-fm-scrobbler · Sep 8, 2019 · 1cca2b4 · 1cca2b4
2 parents 5fd9fd1 + ce1ef1c
commit 1cca2b4
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 26 deletions.
diff --git a/README.md b/README.md
@@ -3,14 +3,17 @@
 [<img src="https://github.com/simple-last-fm-scrobbler/sls/blob/master/art/icon_new.svg" alt="Icon" height="60">](https://github.com/simple-last-fm-scrobbler/sls/blob/master/art/icon_new.svg) [![Build Status](https://travis-ci.com/simple-last-fm-scrobbler/sls.svg?branch=master)](https://travis-ci.com/simple-last-fm-scrobbler/sls) [![GitHub release](https://img.shields.io/github/release/simple-last-fm-scrobbler/sls)](https://github.com/simple-last-fm-scrobbler/sls/releases/) [![GitHub release](https://img.shields.io/github/release-pre/simple-last-fm-scrobbler/sls)](https://github.com/simple-last-fm-scrobbler/sls/releases/) [![License](http://img.shields.io/:license-apache-blue.svg?style=round)](LICENSE.md) [![Pull Requests](https://img.shields.io/github/issues-pr/simple-last-fm-scrobbler/sls.svg?style=round)](https://github.com/simple-last-fm-scrobbler/sls/pulls)
 
 
-[![Gitter](https://img.shields.io/gitter/room/tgwizard/sls.svg?logo=gitter&style=round)](https://gitter.im/tgwizard/sls)
+[![License](http://img.shields.io/:license-apache-blue.svg?style=round)](LICENSE.md) [![Pull Requests](https://img.shields.io/github/issues-pr/simple-last-fm-scrobbler/sls.svg?style=round)](https://github.com/simple-last-fm-scrobbler/sls/pulls) [![Gitter](https://img.shields.io/gitter/room/tgwizard/sls.svg?logo=gitter&style=round)](https://gitter.im/tgwizard/sls)
 [![Discord](https://img.shields.io/discord/592703275837685760.svg?logo=discord&style=round)](https://discordapp.com/channels/592703275837685760)
 
-[![Feature Requests](https://img.shields.io/github/issues/simple-last-fm-scrobbler/sls/feature%20request.svg?style=round)](https://github.com/simple-last-fm-scrobbler/sls/labels/feature%20request) [![App Support Issues](https://img.shields.io/github/issues/simple-last-fm-scrobbler/sls/app%20support.svg?style=round)](https://github.com/simple-last-fm-scrobbler/sls/labels/app%20support) [![Bugs Issues](https://img.shields.io/github/issues/simple-last-fm-scrobbler/sls/bugs.svg?style=round)](https://github.com/simple-last-fm-scrobbler/sls/labels/bugs) [![Issues](https://img.shields.io/github/issues/simple-last-fm-scrobbler/sls.svg?style=round)](https://github.com/simple-last-fm-scrobbler/sls/issues)
-
-[![Serious Issues](https://img.shields.io/github/issues/simple-last-fm-scrobbler/sls/serious.svg?style=round)](https://github.com/simple-last-fm-scrobbler/sls/labels/serious)
+[![Feature Requests](https://img.shields.io/github/issues/simple-last-fm-scrobbler/sls/feature%20request.svg?style=round)](https://github.com/simple-last-fm-scrobbler/sls/labels/feature%20request) [![App Support Issues](https://img.shields.io/github/issues/simple-last-fm-scrobbler/sls/app%20support.svg?style=round)](https://github.com/simple-last-fm-scrobbler/sls/labels/app%20support) [![Bugs Issues](https://img.shields.io/github/issues/simple-last-fm-scrobbler/sls/bugs.svg?style=round)](https://github.com/simple-last-fm-scrobbler/sls/labels/bugs) [![Issues](https://img.shields.io/github/issues/simple-last-fm-scrobbler/sls.svg?style=round)](https://github.com/simple-last-fm-scrobbler/sls/issues) [![Serious Issues](https://img.shields.io/github/issues/simple-last-fm-scrobbler/sls/serious.svg?style=round)](https://github.com/simple-last-fm-scrobbler/sls/labels/serious)
 [![Critical Issues](https://img.shields.io/github/issues/simple-last-fm-scrobbler/sls/critical.svg?style=round)](https://github.com/simple-last-fm-scrobbler/sls/labels/critical)
 
+
+### Translators! Your Help Is Needed.
+
+ * ###### Head to [OpenSkyApp](https://os0hucc.oneskyapp.com/admin/project/dashboard/project/344237) for exact translator information.
+
 Simple Scrobbler (SS) is a simple app that scrobbles music listened to on an Android phone. Scrobbling means submitting listening information to Last.fm (and optionally/additionally Libre.fm and ListenBrainz) when you play a track, and you can then get music recommendations and view you listening history and statistics at Last.fm.
 
 Before the release of a new version of SLS, it will be available here to test for one week in [GitHub Releases](https://github.com/simple-last-fm-scrobbler/sls/releases).
@@ -123,8 +126,8 @@ Before the release of a new version of SLS, it will be available here to test fo
  * More
 
 ### Supported languages
-* ###### Head to [Transifex](https://www.transifex.com/sls/sls) for exact information.
 
+ * ###### Head to [OpenSkyApp](https://os0hucc.oneskyapp.com/admin/project/dashboard/project/344237) for exact translator information.
  * English
  * Spanish
  * French

diff --git a/app/src/main/assets/changelog.txt b/app/src/main/assets/changelog.txt
@@ -2,6 +2,9 @@ Visit,
 https://github.com/simple-last-fm-scrobbler/sls
 For more details.
 
+- 1.6.1 (2018-9-7) codename: dingus
+  * Fixed icon kitkat
+
 - 1.6.0 (2018-9-7) codename: cingus
   * Fixed Google Play logo block flag
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -183,6 +183,7 @@
     <string name="advanced_options_net_roaming_summary_off">Won\'t submit data when roaming</string>
     <string name="advanced_options_net_roaming_summary_on">Will submit data when roaming</string>
     <string name="notification_priority">Notification Priority</string>
+    <string name="secure_socket_info" translatable="false">Use SSL, https://?</string>
     <string-array name="notification_priority_list">
         <item>min</item>
         <item>low</item>
@@ -230,4 +231,26 @@
     <string name="find_battery_settings">Find Battery Optimization ignore list in Android Settings, add Simple Scrobbler</string>
     <string name="permission_notification_listener_notice">Enable Notifications Access for Simple Scrobbler in Android Settings</string>
     <!-- END permissions activity -->
+
+
+    <!-- START correction rules strings -->
+    <string name="old_track">Track Title</string>
+    <string name="new_track">New Track Title</string>
+    <string name="old_artist">Artist Title</string>
+    <string name="new_artist">New Artist Title</string>
+    <string name="old_album">Album Title</string>
+    <string name="new_album">New Album Title</string>
+    <string name="save_as_rule">Save As Rule</string>
+    <string name="delete_all_rules">Delete All Rules</string>
+    <string name="add_new_rule">Add New Rule</string>
+    <string name="edit_rule">Edit Rule</string>
+    <string name="delete_rule">Delete Rule</string>
+    <string name="field">Field</string>
+    <string name="initial_value">Initial Value</string>
+    <string name="changed_value">Changed Value</string>
+    <string name="track">Track</string>
+    <string name="album">Album</string>
+    <string name="artist">Artist</string>
+    <string name="empty_rules">...</string>
+    <!-- END  correction rules strings -->
 </resources>
diff --git a/app/src/main/res/values/strings_nontranslatable.xml b/app/src/main/res/values/strings_nontranslatable.xml
@@ -11,7 +11,6 @@
     <string name="listen_brainz_url" translatable="false">ListenBrainz URL</string>
     <string name="listen_brainz_api_url" translatable="false">ListenBrainz API URL</string>
     <string name="listen_brainz_token" translatable="false">ListenBrainz Token</string>
-    <string name="secure_socket_info" translatable="false">Use SSL, https://?</string>
     <string name="supported_musicapps" translatable="false">Spotify, Google Music, Deezer, 
 		Rhapsody/Napster, Rdio, My Cloud Player, SoundCloud, 8tracks, 
 		InfiniTracks, Squeezer, Amazon Music, Huawei, n7player, BuMP, PowerAMP, Black Player, AIMP, 
@@ -24,26 +23,6 @@
 		Default Sony Ericsson/Xperia Music Player, myTouch 4G, LG Music Player, 
 		DAAP Media Player, xenoAmp, Marine, MediaMonkey, Pulsar, 
     </string>
-    <!-- START correction rules strings -->
-    <string name="old_track" translatable="false">Track Title</string>
-    <string name="new_track" translatable="false">New Track Title</string>
-    <string name="old_artist" translatable="false">Artist Title</string>
-    <string name="new_artist" translatable="false">New Artist Title</string>
-    <string name="old_album" translatable="false">Album Title</string>
-    <string name="new_album" translatable="false">New Album Title</string>
-    <string name="save_as_rule" translatable="false">Save As Rule</string>
-    <string name="delete_all_rules" translatable="false">Delete All Rules</string>
-    <string name="add_new_rule" translatable="false">Add New Rule</string>
-    <string name="edit_rule" translatable="false">Edit Rule</string>
-    <string name="delete_rule" translatable="false">Delete Rule</string>
-    <string name="field" translatable="false">Field</string>
-    <string name="initial_value" translatable="false">Initial Value</string>
-    <string name="changed_value" translatable="false">Changed Value</string>
-    <string name="track" translatable="false">Track</string>
-    <string name="album" translatable="false">Album</string>
-    <string name="artist" translatable="false">Artist</string>
-    <string name="empty_rules" translatable="false">...</string>
-    <!-- END  correction rules strings -->
 
     <!-- START NetApp and Preference Data -->
     <string name="settings_prefix_last_fm" translatable="false">last.fm</string>