From f45a06098d4c4e60b2fdc78836bf6ef664900a91 Mon Sep 17 00:00:00 2001
From: Nikolaus Gotsche <n@softwarefools.com>
Date: Wed, 2 Dec 2015 20:53:15 +0100
Subject: Fixed Language Fliper

---
 app/src/main/res/values/strings.xml | 12 +++++++++++-
 app/src/main/res/xml/settings.xml   | 29 ++++++++++++++++++++---------
 2 files changed, 31 insertions(+), 10 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 237b4f2..fa7577e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -11,6 +11,11 @@
 
     <string name="lang_german">Deutsch</string>
     <string name="lang_english">English</string>
+    <string name="lang_spanish">Español</string>
+    <string name="lang_french">Français</string>
+    <string name="lang_italian">Italiano</string>
+    <string name="lang_polish">Polski</string>
+    <string name="lang_russian">Русский</string>
 
     <string name="settings_devname">Device Name</string>
     <string name="settings_devname_sum">Please provide Devices Name</string>
@@ -25,6 +30,11 @@
     <string name="setting_speak_sum">Let the System Talk to you</string>
     <string name="setting_write">Write</string>
     <string name="setting_write_sum">Recieve written Notes from the System</string>
-
+    <string name="settings_devweight">Device Weight</string>
+    <string name="settings_devweight_sum">Put in your devices weight in gramm</string>
+    <string name="settings_intent_bugreport">Report A Bug</string>
+    <string name="settings_intent_bugreport_sum">Redirect to the SF.com Mantis server</string>
+    <string name="settings_language">Select Language</string>
+    <string name="settings_language_sum">Select one of the available Languages</string>
 
 </resources>
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
index de13ed0..0a740ab 100644
--- a/app/src/main/res/xml/settings.xml
+++ b/app/src/main/res/xml/settings.xml
@@ -6,6 +6,17 @@
         <EditTextPreference android:title="@string/settings_devname"
             android:key="devicename"
             android:summary="@string/settings_devname_sum"></EditTextPreference>
+
+        <EditTextPreference android:title="@string/settings_devweight"
+            android:key="deviceweight"
+            android:summary="@string/settings_devweight_sum"></EditTextPreference>
+        <ListPreference     android:title="@string/settings_language"
+            android:summary="@string/settings_language_sum"
+            android:key="applicationLanguage"
+            android:defaultValue="de"
+            android:entries="@array/langlist"
+            android:entryValues="@array/langValues" />
+
         <CheckBoxPreference android:title="@string/setting_speak"
             android:defaultValue="true"
             android:summary="@string/setting_speak_sum"
@@ -15,16 +26,8 @@
             android:summary="@string/setting_write_sum"
             android:key="applicationWriting" />
     </PreferenceCategory>
-    <PreferenceCategory
-        android:title="@string/settings_recording_preferences">
 
-    <CheckBoxPreference android:title="@string/setting_recording"
-        android:defaultValue="false"
-        android:summary="@string/setting_recording_sum"
-        android:key="applicationRecording" />
-    </PreferenceCategory>
-    <PreferenceCategory
-        android:title="@string/settings_launch_preferences">
+    <PreferenceCategory android:title="@string/settings_launch_preferences">
     <PreferenceScreen
         android:title="@string/settings_intent_reset"
         android:summary="@string/settings_intent_reset_sum">
@@ -33,6 +36,14 @@
             android:data="http://www.android.com" />
 
     </PreferenceScreen>
+        <PreferenceScreen
+            android:title="@string/settings_intent_bugreport"
+            android:summary="@string/settings_intent_bugreport_sum">
+
+            <intent android:action="android.intent.action.VIEW"
+                android:data="https://secure.softwarefools.com/mantis/" />
+
+        </PreferenceScreen>
 
     </PreferenceCategory>
 </PreferenceScreen>
\ No newline at end of file
-- 
cgit v1.2.3