plectrum

commit c05c26671ea681f1d82f92dd10b888013b419f9b
parent 21458ab3d18f5938746dbd39c6d53a8317fb3332
Author: gstraube <gstraube@mailbox.org>
Date:   Tue,  1 May 2018 15:25:36 +0200

Merge branch 'toXel-stringlate-de-rDE-7519'

Diffstat:
M
.idea/misc.xml
 | 
3
---
A
app/src/main/res/values-de-rDE/strings.xml
 | 
25
+++++++++++++++++++++++++
M
build.gradle
 | 
2
+-

3 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/.idea/misc.xml b/.idea/misc.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
   <component name="NullableNotNullManager">
     <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
@@ -0,0 +1,25 @@
+<resources>
+    <string name="privacy_policy">Datenschutzrichtlinie anzeigen</string>
+    <string name="set_notation">Notation wählen</string>
+    <string name="toggle_dark_mode">Dunkelmodus umschalten</string>
+    <string name="choose_notation">Wähle die Notation</string>
+    <string name="permission_required">Berechtigungen erforderlich</string>
+    <string name="set_reference_pitch">Referenztonhöhe einstellen</string>
+    <string name="choose_a_frequency">Wähle eine Frequenz:</string>
+    <string-array name="tunings">
+        <item>Gitarre (Standard)</item>
+        <item>Gitarre (Drop D)</item>
+        <item>Gitarre (Drop C)</item>
+        <item>Gitarre (Drop C#)</item>
+        <item>Gitarre (Open G)</item>
+        <item>Bass (Standard)</item>
+        <item>Ukulele (Standard)</item>
+        <item>Ukulele (D tuning)</item>
+        <item>Geige (Standard)</item>
+        <item>Chromatisch</item>
+    </string-array>
+    <string-array name="notations">
+        <item name="scientific">Wissenschaftlich</item>
+        <item name="sol">Solfège</item>
+    </string-array>
+</resources>
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
+        classpath 'com.android.tools.build:gradle:3.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files