Merge branch 'feat-germanLanguage' into develop

SoniControl/app/src/main/res/values/strings.xml

@@ -100,4 +100,19 @@
     <string name="settings_blocking_duration_plural">Blocking duration (%s minutes)</string>
     <string name="stored_detections_will_be_blocked">will be blocked</string>
     <string name="stored_detections_will_be_ignored">will be ignored</string>
+    <string name="settings_category_jammer">Expert settings - Jammer</string>
+    <string name="settings_category">Settings</string>
+    <string name="settings_category_expert">Expert settings - RESET</string>
+    <string name="settings_title_json_save">Save detections in JSON file</string>
+    <string name="settings_title_clear_detections">Clear detections of JSON file</string>
+    <string name="settings_title_dont_ask">Don\'t ask for activating location</string>
+    <string name="settings_title_microphone_for_blocking">Use microphone for blocking</string>
+    <string name="settings_title_preventive_blocking">Preventive blocking</string>
+    <string name="settings_title_network_location">Use network connection for location</string>
+    <string name="settings_title_gps_location">Use GPS for location</string>
+    <string name="settings_title_pulse_duration">Pulse duration (ms)</string>
+    <string name="settings_title_pause_duration">Pause duration (ms)</string>
+    <string name="settings_title_bandwidth">Bandwidth</string>
+    <string name="settings_title_blocking_duration">Blocking duration in minutes</string>
+    <string name="settings_title_location_radius">Location radius (metre)</string>
 </resources>

SoniControl/app/src/main/res/xml/settings_release.xml

@@ -19,7 +19,7 @@
   -->
 
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <PreferenceCategory android:title="Settings">
+    <PreferenceCategory android:title="@string/settings_category">
 
         <CheckBoxPreference
             android:defaultValue="false"
@@ -35,32 +35,32 @@
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="cbprefGpsUse"
-            android:title="Use GPS for location" />
+            android:title="@string/settings_title_gps_location" />
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="cbprefNetworkUse"
-            android:title="Use network connection for location" />
+            android:title="@string/settings_title_network_location" />
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="cbprefPreventiveSpoofing"
-            android:title="Preventive blocking" />
+            android:title="@string/settings_title_preventive_blocking" />
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="cbprefMicBlock"
-            android:title="Use microphone for blocking" />
+            android:title="@string/settings_title_microphone_for_blocking" />
         <CheckBoxPreference
             android:defaultValue="false"
             android:key="cbAlertLocationDontAskAgain"
-            android:title="Don't ask for activating location" />
+            android:title="@string/settings_title_dont_ask" />
         <CheckBoxPreference
             android:defaultValue="true"
             android:key="cbprefJsonSave"
-            android:title="Save detections in JSON file" />
+            android:title="@string/settings_title_json_save" />
         <Preference
             android:key="deleteJson"
-            android:title="Clear detections of JSON file"></Preference>
+            android:title="@string/settings_title_clear_detections"></Preference>
     </PreferenceCategory>
-    <PreferenceCategory android:title="Expert settings - Jammer">
+    <PreferenceCategory android:title="@string/settings_category_jammer">
     <EditTextPreference
         android:defaultValue="4000"
         android:key="etprefPulseDuration"
@@ -92,7 +92,7 @@
             android:singleLine="true"
             android:title="@string/settings_title_blocking_duration" />
     </PreferenceCategory>
-    <PreferenceCategory android:title="Expert settings - RESET">
+    <PreferenceCategory android:title="@string/settings_category_expert">
     <Preference
         android:key="resetPreferences"
         android:title="@string/settings_reset_settings"></Preference>