diff --git a/PlayWall/assets/de/tobias/playpad/assets/lang/_de.properties b/PlayWall/assets/de/tobias/playpad/assets/lang/_de.properties index 3be3160a627b688da59853b720e73829af98dea4..69c9133951278d6a9b34823993f296da28be887f 100644 --- a/PlayWall/assets/de/tobias/playpad/assets/lang/_de.properties +++ b/PlayWall/assets/de/tobias/playpad/assets/lang/_de.properties @@ -4,7 +4,7 @@ # Standard - File Standard.File.Save=Gespeichert Standard.Copy={} - Kopie -Standard.Time.Seconds={} sec +Standard.Time.Seconds={} sek Standard.Time.Volume={} % # File - Filter @@ -188,7 +188,7 @@ Action.Page.Name=Seiten Action.Navigate.Name=Navigation #Content -Content.Empyt= +Content.Empty= Content.Audio.Name=Audio # NavigationType - Enum diff --git a/PlayWall/src/de/tobias/playpad/PlayPadMain.java b/PlayWall/src/de/tobias/playpad/PlayPadMain.java index ad32fa0438ba446b509a8493063435044199090e..bf8a5d0b81730e75c89f59269db88722e2b2297d 100644 --- a/PlayWall/src/de/tobias/playpad/PlayPadMain.java +++ b/PlayWall/src/de/tobias/playpad/PlayPadMain.java @@ -91,8 +91,6 @@ import net.xeoh.plugins.base.impl.PluginManagerFactory; // Profile mit UUID -// FEATURE Backups irgendwann löschen -// FEATURE Global Volume Trigger mit x% und 100% // Pad System neu machen // Neue PadViewController für jedes pad @@ -101,9 +99,13 @@ import net.xeoh.plugins.base.impl.PluginManagerFactory; // TEST Trigger -// FEATURE Option bei Import Media auch Copy Media in Library + +// PlayWall 5.1 +// FEATURE Global Volume Trigger mit x% und 100% +// FEATURE Option bei Import Media auch Copy Media in Library // FEATURE lnk für Windows mit Dateiparameter +// FEATURE Backups irgendwann löschen public class PlayPadMain extends Application implements LocalizationDelegate, PlayPad, ProfileListener { diff --git a/PlayWall/src/de/tobias/playpad/Strings.java b/PlayWall/src/de/tobias/playpad/Strings.java index d459d168dacbdaa02c9e385fc73f435ce8a4f721..6443c76d18ff5e5ca372785b6f31588b6eeec5da 100644 --- a/PlayWall/src/de/tobias/playpad/Strings.java +++ b/PlayWall/src/de/tobias/playpad/Strings.java @@ -184,7 +184,7 @@ public class Strings { public static final String Action_Navigate_Name = "Action.Navigate.Name"; // Content - public static final String Content_Empty = "Content.Empyt"; + public static final String Content_Empty = "Content.Empty"; public static final String Content_Audio_Name = "Content.Audio.Name"; // NavigationType - Enum diff --git a/PlayWall/src/de/tobias/playpad/audio/ClipAudioHandler.java b/PlayWall/src/de/tobias/playpad/audio/ClipAudioHandler.java index 4d422336f8490a1fad151e58f02172067e0ed296..bc65aaeac79b714db9563ce171433ea73954d8ff 100644 --- a/PlayWall/src/de/tobias/playpad/audio/ClipAudioHandler.java +++ b/PlayWall/src/de/tobias/playpad/audio/ClipAudioHandler.java @@ -34,7 +34,7 @@ import javazoom.jl.decoder.JavaLayerException; public class ClipAudioHandler extends AudioHandler { - public static final String NAME = "Clip"; + public static final String NAME = "Clip (Experimental)"; private static final String MP3 = "mp3"; private Mixer mixer; diff --git a/PlayWallCore/src/de/tobias/playpad/pad/Pad.java b/PlayWallCore/src/de/tobias/playpad/pad/Pad.java index 0a1ebcf9eb1a56f5fefc72a9f755aa511df2c5a7..71dbdce75429f5ed3679a906edc08ba57b5a5856 100644 --- a/PlayWallCore/src/de/tobias/playpad/pad/Pad.java +++ b/PlayWallCore/src/de/tobias/playpad/pad/Pad.java @@ -494,7 +494,7 @@ public class Pad { } // Trigger - Element triggersElement = element.element("Triggers"); + Element triggersElement = element.element("Triggers"); // TODO Externalize if (triggersElement != null) { for (Object triggerObj : triggersElement.elements("Trigger")) { if (triggerObj instanceof Element) {