From 0045caa93689ee671b91b9510e71083b766aac4b Mon Sep 17 00:00:00 2001
From: Thomas Knepper <thknepper@gmx.de>
Date: Fri, 4 Apr 2014 22:16:37 +0200
Subject: fix typo

---
 res/values-de/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ce37ae34..83105212 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -198,7 +198,7 @@
 		\nGeschätzte Größe: %2$s</string>
 	<string name="download.failed_to_load">Laden fehlgeschlagen</string>
 
-	<string name="sync.title">DSub: New Medien verfügbar</string>
+	<string name="sync.title">DSub: Neue Medien verfügbar</string>
 	<string name="sync.new_podcasts">Neuer Podcast: %s</string>
 	<string name="sync.new_playlists">Neu in Wiedergabeliste: %s</string>
 	<string name="sync.new_albums">Neues Album: %s</string>
@@ -377,7 +377,7 @@
 	<string name="settings.menu_options.shared_summary">Zeige \"Freigeben\" im Menü</string>
 	<string name="settings.browse_by_tags">Tags nutzen</string>
 	<string name="settings.browse_by_tags_summary">Tags statt Ordner verwenden.  Benötigt Subsonic 4.7+</string>
-	<string name="settings.override_system_language">In Englisch anmzeigen</string>
+	<string name="settings.override_system_language">In Englisch anzeigen</string>
 	<string name="settings.override_system_language_summary">Verwende Englisch anstatt Deutsch für DSub. Benötigt einen Neustart der App.</string>
 
 	<string name="shuffle.title">Mischen von</string>
-- 
cgit v1.2.3


From 8d31d2edebd352b12693914516351399ae3f965d Mon Sep 17 00:00:00 2001
From: Thomas Knepper <thknepper@gmx.de>
Date: Fri, 4 Apr 2014 22:50:19 +0200
Subject: Use resource string instead of hard code

---
 res/values-de/strings.xml                                   | 2 ++
 res/values/strings.xml                                      | 2 ++
 src/github/daneren2005/dsub/fragments/DownloadFragment.java | 4 ++--
 3 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 83105212..db4a92a0 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -197,6 +197,8 @@
 	<string name="download.downloading_summary_expanded">Aktuell: %1$s
 		\nGeschätzte Größe: %2$s</string>
 	<string name="download.failed_to_load">Laden fehlgeschlagen</string>
+	<string name="download.title_now_playing">Aktuelles Lied</string>
+	<string name="download.title_downloading">Aktive Downloads</string>
 
 	<string name="sync.title">DSub: Neue Medien verfügbar</string>
 	<string name="sync.new_podcasts">Neuer Podcast: %s</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b54a705e..5b2d9b15 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -197,6 +197,8 @@
 	<string name="download.downloading_summary_expanded">Current: %1$s
 		\nEstimated Size: %2$s</string>
 	<string name="download.failed_to_load">Failed to load</string>
+	<string name="download.title_now_playing">Now Playing</string>
+	<string name="download.title_downloading">Downloading</string>
 
 	<string name="sync.title">DSub: New media is available</string>
 	<string name="sync.new_podcasts">New podcasts: %s</string>
diff --git a/src/github/daneren2005/dsub/fragments/DownloadFragment.java b/src/github/daneren2005/dsub/fragments/DownloadFragment.java
index bc30eb02..ec75af80 100644
--- a/src/github/daneren2005/dsub/fragments/DownloadFragment.java
+++ b/src/github/daneren2005/dsub/fragments/DownloadFragment.java
@@ -146,7 +146,7 @@ public class DownloadFragment extends SubsonicFragment implements OnGestureListe
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
 		rootView = inflater.inflate(R.layout.download, container, false);
-		setTitle(nowPlaying ? "Now Playing" : "Downloading");
+		setTitle(nowPlaying ? R.string.download_title_now_playing : R.string.download_title_downloading);
 		
 		mainLayout = rootView.findViewById(R.id.download_layout);
 		if(!primaryFragment) {
@@ -1403,7 +1403,7 @@ public class DownloadFragment extends SubsonicFragment implements OnGestureListe
 
 	private void toggleNowPlaying() {
 		nowPlaying = !nowPlaying;
-		setTitle(nowPlaying ? "Now Playing" : "Downloading");
+		setTitle(nowPlaying ? R.string.download_title_now_playing : R.string.download_title_downloading);
 		onDownloadListChanged(true);
 	}
 
-- 
cgit v1.2.3


From e2c0547795499cd29ae3dd0d850e4a521d72496f Mon Sep 17 00:00:00 2001
From: Thomas Knepper <thknepper@gmx.de>
Date: Sat, 5 Apr 2014 11:58:17 +0200
Subject: fix typo

---
 res/values-de/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'res')

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index db4a92a0..96cca428 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -369,7 +369,7 @@
 	<string name="settings.sync_most_recent">Synchronisiere neu hinzugefügte Lieder</string>
 	<string name="settings.sync_most_recent_summary">Lade neu hinzugefügte Alben automatisch herunter</string>
 	<string name="settings.sync_starred">Synchronisiere Favoriten</string>
-	<string name="settings.sync_starred_summary">Synchronisiere favorisierte Lieder, Albem und Künstler automatisch</string>
+	<string name="settings.sync_starred_summary">Synchronisiere favorisierte Lieder, Alben und Künstler automatisch</string>
 	<string name="settings.sync_notification">Benachrichtigung nach Synchronisierung</string>
 	<string name="settings.sync_notification_summary">Zeige eine Benachrichtigung nachdem neue Medien synchronisiert wurden.</string>
 	<string name="settings.menu_options.title">Optionale Menü Einträge</string>
-- 
cgit v1.2.3


From 45979d1fe67a75cf215060bacf57bd68411ab30f Mon Sep 17 00:00:00 2001
From: Thomas Knepper <thknepper@gmx.de>
Date: Sat, 5 Apr 2014 15:52:00 +0200
Subject: Use resource string instead of hard code

---
 res/values-de/strings.xml                                  | 3 ++-
 res/values/strings.xml                                     | 1 +
 src/github/daneren2005/dsub/activity/SettingsActivity.java | 2 +-
 src/github/daneren2005/dsub/util/Util.java                 | 3 +++
 4 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 96cca428..494ad2c4 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -21,7 +21,8 @@
 	<string name="common.play_external">Video abspielen</string>
 	<string name="common.stream_external">Video streamen</string>
 	<string name="common.confirm">Bestätigen</string>
-	<string name="common.confirm_message">Wollen Sie %1$s %2$s?</string>
+	<string name="common.confirm_message">Wollen Sie %2$s %1$s?</string>
+	<string name="common.confirm_message_cache">den Cache</string>
 	<string name="common.empty">Nicht gefunden</string>
 	<string name="common.warning">Warnung</string>
 
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 5b2d9b15..a7f5c2f6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -22,6 +22,7 @@
 	<string name="common.stream_external">Stream Video</string>
 	<string name="common.confirm">Confirm</string>
 	<string name="common.confirm_message">Do you want to %1$s %2$s?</string>
+	<string name="common.confirm_message_cache">cache</string>
 	<string name="common.empty">None found</string>
 	<string name="common.warning">Warning</string>
 
diff --git a/src/github/daneren2005/dsub/activity/SettingsActivity.java b/src/github/daneren2005/dsub/activity/SettingsActivity.java
index f3d564a1..bf72f9a9 100644
--- a/src/github/daneren2005/dsub/activity/SettingsActivity.java
+++ b/src/github/daneren2005/dsub/activity/SettingsActivity.java
@@ -132,7 +132,7 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
 		findPreference("clearCache").setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
 			@Override
 			public boolean onPreferenceClick(Preference preference) {
-				Util.confirmDialog(SettingsActivity.this, R.string.common_delete, "cache", new DialogInterface.OnClickListener() {
+				Util.confirmDialog(SettingsActivity.this, R.string.common_delete, R.string.common_confirm_message_cache, new DialogInterface.OnClickListener() {
 					@Override
 					public void onClick(DialogInterface dialog, int which) {
 						new LoadingTask<Void>(SettingsActivity.this, false) {
diff --git a/src/github/daneren2005/dsub/util/Util.java b/src/github/daneren2005/dsub/util/Util.java
index a18cc975..8488420e 100644
--- a/src/github/daneren2005/dsub/util/Util.java
+++ b/src/github/daneren2005/dsub/util/Util.java
@@ -651,6 +651,9 @@ public final class Util {
         toast.show();
     }
 	
+	public static void confirmDialog(Context context, int action, int subject, DialogInterface.OnClickListener onClick) {
+		Util.confirmDialog(context, context.getResources().getString(action).toLowerCase(), context.getResources().getString(subject), onClick);
+	}
 	public static void confirmDialog(Context context, int action, String subject, DialogInterface.OnClickListener onClick) {
 		Util.confirmDialog(context, context.getResources().getString(action).toLowerCase(), subject, onClick);
 	}
-- 
cgit v1.2.3


From 035d49df7ee3c9947e48f5c552618fd67d4bd990 Mon Sep 17 00:00:00 2001
From: Thomas Knepper <thknepper@gmx.de>
Date: Mon, 7 Apr 2014 16:02:22 +0200
Subject: improve german translation

---
 res/values-de/strings.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'res')

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 494ad2c4..ce60bb59 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -316,17 +316,17 @@
 	<string name="settings.playlist_title">Wiedergeben</string>
 	<string name="settings.playlist_random_size_title">Zufallsgröße</string>
 	<string name="settings.sleep_timer_title">Einschlaftimer</string>
-	<string name="settings.sleep_timer_duration_title">EInschlafdauer</string>
+	<string name="settings.sleep_timer_duration_title">Einschlafdauer</string>
 	<string name="settings.sleep_timer_off">Aus</string>
 	<string name="settings.sleep_timer_on">An</string>
 	<string name="settings.sleep_timer_always_on">Immer An</string>
-	<string name="settings.temp_loss_title">Bei Verbindungsverlust zum Kopfhörer/Lautsprecher</string>
+	<string name="settings.temp_loss_title">Verhalten bei Benachrichtigungen</string>
 	<string name="settings.temp_loss_pause">Immer pausieren</string>
 	<string name="settings.temp_loss_pause_lower">Pausiere und Lautstärke bei Bedarf veringern</string>
 	<string name="settings.temp_loss_lower">Lautstärke veringern</string>
 	<string name="settings.temp_loss_nothing">Nichts machen</string>
-	<string name="settings.disconnect_pause_title">Pause bei Verbindungsverlust</string>
-	<string name="settings.disconnect_pause_both">Pausiere immer</string>
+	<string name="settings.disconnect_pause_title">Verhalten bei Verbindungsverlust</string>
+	<string name="settings.disconnect_pause_both">Immer pausieren</string>
 	<string name="settings.disconnect_pause_headphone">Nur bei Kopfhörer pausieren</string>
 	<string name="settings.disconnect_pause_bluetooth">Nur bei Bluetooth pausieren</string>
 	<string name="settings.disconnect_pause_neither">Nichts machen</string>
@@ -336,7 +336,7 @@
 	<string name="settings.gapless_playback_summary">Das Galaxy S3 scheint Probleme seit der Einführung der lückenlosen Wiedergabe zu haben. Zur Behebung schalten Sie dies ab.</string>
 	<string name="settings.chat_refresh">Chat Aktualisierungsrate (Sekunden)</string>
 	<string name="settings.chat_enabled">Chat aktiv</string>
-	<string name="settings.chat_enabled_summary">Chat im Seitenmenu anzeigen</string>
+	<string name="settings.chat_enabled_summary">Chat im Seitenmenü anzeigen</string>
 	<string name="settings.video_title">Video</string>
 	<string name="settings.video_player">Video Player</string>
 	<string name="settings.video_raw">Raw (benötigt Subsonic 4.8+)</string>
@@ -376,7 +376,7 @@
 	<string name="settings.menu_options.title">Optionale Menü Einträge</string>
 	<string name="settings.menu_options.play_next_summary">Zeige \"Als nächstes abspielen\" im Menü</string>
 	<string name="settings.menu_options.play_last_summary">Zeige \"Als letztes abspielen\" im Menü</string>
-	<string name="settings.menu_options.star_summary">Zeige Favorit in den Menus</string>
+	<string name="settings.menu_options.star_summary">Zeige Favorit im Menü</string>
 	<string name="settings.menu_options.shared_summary">Zeige \"Freigeben\" im Menü</string>
 	<string name="settings.browse_by_tags">Tags nutzen</string>
 	<string name="settings.browse_by_tags_summary">Tags statt Ordner verwenden.  Benötigt Subsonic 4.7+</string>
-- 
cgit v1.2.3


From 1f8ad0577fcab7cd6a4b43b6935ec4f3d5dbf884 Mon Sep 17 00:00:00 2001
From: Thomas Knepper <thknepper@gmx.de>
Date: Wed, 9 Apr 2014 11:17:53 +0200
Subject: Revert "Use resource string instead of hard code"

This reverts commit 8d31d2edebd352b12693914516351399ae3f965d.
---
 res/values-de/strings.xml                                   | 2 --
 res/values/strings.xml                                      | 2 --
 src/github/daneren2005/dsub/fragments/DownloadFragment.java | 4 ++--
 3 files changed, 2 insertions(+), 6 deletions(-)

(limited to 'res')

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index ce60bb59..3d324cbc 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -198,8 +198,6 @@
 	<string name="download.downloading_summary_expanded">Aktuell: %1$s
 		\nGeschätzte Größe: %2$s</string>
 	<string name="download.failed_to_load">Laden fehlgeschlagen</string>
-	<string name="download.title_now_playing">Aktuelles Lied</string>
-	<string name="download.title_downloading">Aktive Downloads</string>
 
 	<string name="sync.title">DSub: Neue Medien verfügbar</string>
 	<string name="sync.new_podcasts">Neuer Podcast: %s</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index a7f5c2f6..87c7c8e0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -198,8 +198,6 @@
 	<string name="download.downloading_summary_expanded">Current: %1$s
 		\nEstimated Size: %2$s</string>
 	<string name="download.failed_to_load">Failed to load</string>
-	<string name="download.title_now_playing">Now Playing</string>
-	<string name="download.title_downloading">Downloading</string>
 
 	<string name="sync.title">DSub: New media is available</string>
 	<string name="sync.new_podcasts">New podcasts: %s</string>
diff --git a/src/github/daneren2005/dsub/fragments/DownloadFragment.java b/src/github/daneren2005/dsub/fragments/DownloadFragment.java
index ec75af80..bc30eb02 100644
--- a/src/github/daneren2005/dsub/fragments/DownloadFragment.java
+++ b/src/github/daneren2005/dsub/fragments/DownloadFragment.java
@@ -146,7 +146,7 @@ public class DownloadFragment extends SubsonicFragment implements OnGestureListe
 	@Override
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle bundle) {
 		rootView = inflater.inflate(R.layout.download, container, false);
-		setTitle(nowPlaying ? R.string.download_title_now_playing : R.string.download_title_downloading);
+		setTitle(nowPlaying ? "Now Playing" : "Downloading");
 		
 		mainLayout = rootView.findViewById(R.id.download_layout);
 		if(!primaryFragment) {
@@ -1403,7 +1403,7 @@ public class DownloadFragment extends SubsonicFragment implements OnGestureListe
 
 	private void toggleNowPlaying() {
 		nowPlaying = !nowPlaying;
-		setTitle(nowPlaying ? R.string.download_title_now_playing : R.string.download_title_downloading);
+		setTitle(nowPlaying ? "Now Playing" : "Downloading");
 		onDownloadListChanged(true);
 	}
 
-- 
cgit v1.2.3


From 8e5d120459a0375a1468177bc18fc0cd2f43eb58 Mon Sep 17 00:00:00 2001
From: Thomas Knepper <thknepper@gmx.de>
Date: Wed, 9 Apr 2014 12:05:03 +0200
Subject: update german translation

---
 res/values-de/strings.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'res')

diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 3d324cbc..b7ece050 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -35,6 +35,7 @@
 	<string name="button_bar.bookmarks">Lesezeichen</string>
 	<string name="button_bar.shares">Freigaben</string>
 	<string name="button_bar.chat">Chat</string>
+	<string name="button_bar.downloading">Downloads</string>
 
     <string name="main.welcome_title">Willkommen!</string>
     <string name="main.welcome_text">Willkommen zu DSub! Die App ist aktuell für den Subsonic-Demo-Server konfiguriert. Nachdem Sie Ihren eigenen Server
@@ -183,8 +184,6 @@
     <string name="download.jukebox_server_too_old">Fernbedienung wird nicht unterstützt. Aktualisierung des Subsonic-Servers notwendig.</string>
     <string name="download.jukebox_offline">Fernbedienung im Offline-Modus nicht verfügbar.</string>
     <string name="download.jukebox_not_authorized">Fernbedienung ist nicht erlaubt. Bitte aktivieren Sie den Jukebox-Modus unter <b>Nutzer &gt; Einstellungen</b> auf Ihrem Subsonic-Server.</string>
-	<string name="download.show_downloading">Zeige Downloads</string>
-	<string name="download.show_now_playing">Zeige aktuelles Lied</string>
 	<string name="download.timer_length">Timer:</string>
 	<string name="download.start_timer">Starte Timer</string>
 	<string name="download.stop_timer">Stoppe Timer</string>
-- 
cgit v1.2.3


From bc4e3e8e40fe538bb765c0a92dd3635a6b13a36d Mon Sep 17 00:00:00 2001
From: Thomas Knepper <thknepper@gmx.de>
Date: Wed, 9 Apr 2014 15:07:21 +0200
Subject: Use resource string instead of hard code

---
 AndroidManifest.xml       | 8 ++++----
 res/values-de/strings.xml | 2 ++
 res/values/strings.xml    | 2 ++
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'res')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 1028ad06..271b91b3 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -176,22 +176,22 @@
                   android:authorities="github.daneren2005.dsub.provider.DSubSearchProvider"/>
 		<provider android:name="github.daneren2005.dsub.provider.PlaylistStubProvider"
 			android:authorities="github.daneren2005.dsub.playlists.provider"
-			android:label="Playlists"
+			android:label="@string/button_bar.playlists"
 			android:exported="false"
 			android:syncable="true"/>
 		<provider android:name="github.daneren2005.dsub.provider.PodcastStubProvider"
 			android:authorities="github.daneren2005.dsub.podcasts.provider"
-			android:label="Podcasts"
+			android:label="@string/button_bar.podcasts"
 			android:exported="false"
 			android:syncable="true"/>
 		<provider android:name="github.daneren2005.dsub.provider.StarredStubProvider"
 				  android:authorities="github.daneren2005.dsub.starred.provider"
-				  android:label="Starred"
+				  android:label="@string/main.albums_starred"
 				  android:exported="false"
 				  android:syncable="true"/>
 		<provider android:name="github.daneren2005.dsub.provider.MostRecentStubProvider"
 				  android:authorities="github.daneren2005.dsub.mostrecent.provider"
-				  android:label="MostRecent"
+				  android:label="@string/provider.most_recent"
 				  android:exported="false"
 				  android:syncable="true"/>
 
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index b7ece050..2454dbd6 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -380,6 +380,8 @@
 	<string name="settings.override_system_language">In Englisch anzeigen</string>
 	<string name="settings.override_system_language_summary">Verwende Englisch anstatt Deutsch für DSub. Benötigt einen Neustart der App.</string>
 
+	<string name="provider.most_recent">Neue Alben</string>
+
 	<string name="shuffle.title">Mischen von</string>
 	<string name="shuffle.startYear">Startjahr:</string>
 	<string name="shuffle.endYear">Endjahr:</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index dbb08ee0..099f005c 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -400,6 +400,8 @@
 	<string name="settings.override_system_language">Override System Language</string>
 	<string name="settings.override_system_language_summary">Display app in english even if the system language is something DSub has a translation for.  May need to clear the app from memory for changes to take affect.</string>
 
+	<string name="provider.most_recent">Most Recent</string>
+
 	<string name="shuffle.title">Shuffle By</string>
 	<string name="shuffle.startYear">Start Year:</string>
 	<string name="shuffle.endYear">End Year:</string>
-- 
cgit v1.2.3