playmusicexporter/playmusicexporter
1
0
Fork 0
mirror of https://github.com/playmusicexporter/playmusicexporter synced 2024-05-15 13:46:42 +00:00
Code Issues Releases Wiki Activity

Merge branch 'release/v0.9.1'

Browse source
This commit is contained in:
Jan Christian Grünhage 2016-12-31 13:13:05 +01:00
parent 73cdb73b34 51d0ed4c7e
commit 59ad21e0c8
No known key found for this signature in database
GPG key ID: 62BEE5EB8F370DC6
4 changed files with 37 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
playmusicexporter/playmusicexporter.iml
View file

@ -66,14 +66,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@ -82,6 +74,14 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />

19
playmusicexporter/src/main/res/values-de/strings.xml
View file

@ -59,7 +59,7 @@
<string name="action_mode_track_selection">%d Titel ausgewählt</string>
<string name="action_deselect_all">Auswahl aufheben</string>
<string name="toast_error_track_not_offline">Sie können nur offline Titel exportieren. Versuchen Sie das Album in Play Music offline herunterzuladen.</string>
<string name="settings_build_date">Build date</string>
<string name="settings_build_date">Kompilationsdatum</string>
<string name="settings_category_develop">Entwicklung</string>
<string name="dialog_storage_access_denied_title">Daten-Zugriff verweigert</string>
<string name="dialog_storage_access_denied">Der PlayMusicExpoerter benötigt Schreibrechte auf der SD-Karte. Dies ist Teil des Marshmallow-Fix.\n\nBitte starten Sie die App neu und erlauben Sie die Berechtigung.</string>
@ -81,4 +81,21 @@
<string name="settings_version_number">Versionsnummer</string>
<string name="debug_trigger_export_all_title">Jetzt den ExportAllService starten</string>
<string name="settings_category_debug">Debug</string>
<string name="pref_header_debug">Debug</string>
<string name="settings_auto_export_different_path">Export Pfad</string>
<string name="settings_auto_export_different_path_switch">Nutze einen anderen Export Pfad</string>
<string name="settings_auto_export_different_path_switch_summary">Wenn dieser Schalter aus ist nutzt der automatische Export den gleichen Pfad wie der manuelle Export von Alben</string>
<string name="settings_auto_export_different_structure">Verzeichnisbaum</string>
<string name="settings_auto_export_different_structure_switch">Nutze einen anderen Verzeichnisbaum</string>
<string name="settings_auto_export_different_structure_switch_summary">Wenn dieser Schalter aus ist nutzt der automatische Export den gleichen Verzeichnisbaum wie der manuelle Export von Alben</string>
<string name="settings_auto_export_enable_checkbox">Automatischer Export aktiviert</string>
<string name="settings_auto_export_interval_list">Export Interval</string>
<string name="settings_auto_export_require_charging_checkbox">Setze laden voraus</string>
<string name="settings_auto_export_require_unmetered_checkbox">Setze eine unbeschränkte Netzwerkverbindung voraus</string>
<string name="settings_category_alba_export">Export Speichereinstellungen Alben</string>
<string name="settings_category_auto_export_conditions">Export Bedingungen</string>
<string name="settings_category_auto_export_path_subdir">Export Pfad und Verzeichnisbaum</string>
<string name="settings_category_groups_export">Export Speichereinstellungen für Playlists</string>
<string name="settings_export_path_alba">Export Pfad für Alben</string>
<string name="settings_export_path_groups">Export Pfad für Playlists</string>
</resources>

6
playmusicexporter/src/main/res/values/strings.xml
View file

@ -76,11 +76,11 @@
<string name="settings_build_date">Build date</string>
<string name="settings_auto_export_enable_checkbox">Enable automatic export</string>
<string name="settings_auto_export_require_unmetered_checkbox">Require unmetered network?</string>
<string name="settings_auto_export_require_charging_checkbox">Require charging?</string>
<string name="settings_auto_export_require_unmetered_checkbox">Require unmetered network</string>
<string name="settings_auto_export_require_charging_checkbox">Require charging</string>
<string name="settings_auto_export_interval_list">Export interval</string>
<string name="settings_auto_export_different_path_switch">Use a different export path</string>
<string name="settings_auto_export_different_path_switch_summary">Off means that the automatic export uses the same export path as alba.</string>
<string name="settings_auto_export_different_path_switch_summary">Off means that the automatic export uses the same export path as manual album exports.</string>
<string name="settings_auto_export_different_path">Export path</string>
<string name="settings_auto_export_different_structure_switch">Use a different subdirectory structure</string>
<string name="settings_auto_export_different_structure_switch_summary">Off means that the automatic export uses the same subdirectory structure as alba.</string>

16
playmusiclib/playmusiclib.iml
View file

@ -67,14 +67,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@ -83,6 +75,14 @@
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />