From 1c6b9e6cd2ad19c253574e91309bff746319aa28 Mon Sep 17 00:00:00 2001
From: tobias <tobias.ullerich@icloud.com>
Date: Tue, 21 Jun 2016 09:28:53 +0200
Subject: [PATCH] Update Strings and TODOs

---
 .../assets/de/tobias/playpad/assets/lang/_de.properties   | 4 ++--
 PlayWall/src/de/tobias/playpad/PlayPadMain.java           | 8 +++++---
 PlayWall/src/de/tobias/playpad/Strings.java               | 2 +-
 .../src/de/tobias/playpad/audio/ClipAudioHandler.java     | 2 +-
 PlayWallCore/src/de/tobias/playpad/pad/Pad.java           | 2 +-
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/PlayWall/assets/de/tobias/playpad/assets/lang/_de.properties b/PlayWall/assets/de/tobias/playpad/assets/lang/_de.properties
index 3be3160a..69c91339 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 ad32fa04..bf8a5d0b 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 d459d168..6443c76d 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 4d422336..bc65aaea 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 0a1ebcf9..71dbdce7 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) {
-- 
GitLab